Merge branch 'master' of git@stigma:platforma

[redakcja.git] / project / static / css / master.css

diff --git a/project/static/css/master.css b/project/static/css/master.css
index f699cd6..1efa2d6 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -1,6 +1,6 @@
 body {
     margin: 0;
-    font: 100%/1.5 Georgia, Verdana, sans-serif;
+    font: 14px Helvetica, Verdana, sans-serif;
     overflow: hidden;
 }
 
@@ -74,10 +74,13 @@ label {
     overflow-y: scroll;
 }
 
+#whatever {
+    float: left;
+}
+
 #images-wrap {
-    width: 0px;
+/*    width: 0px;*/
     height: 480px;
-    border-right: 1px solid #999;
     overflow-y: scroll;
     overflow-x: hidden;
     background-color: #fff;
@@ -91,15 +94,17 @@ label {
 }
 
 #toggle-sidebar {
+    border-left: 1px solid #999;
+    border-right: 1px solid #999;
     background-color: #DDD;
-    width: 7px;
+    width: 8px;
     height: 100%;
     float: left;
 }
 
 #toggle-sidebar:hover {
     background-color: #999;
-    cursor: pointer;
+    cursor: col-resize;
 }
 
 #status-bar {
@@ -127,3 +132,79 @@ p {
 .image-box {
     border-top: 1px solid #DDD;
 }
+
+#toolbar, #toolbar ol {
+    display: block;
+    margin: 0;
+    padding: 0;
+    background-color: #CCC;
+    border-top: 1px solid #AAA;
+}
+
+#toolbar {
+    overflow: hidden;
+    width: 400%;
+}
+
+#sidebar-toolbar, #sidebar-toolbar ol {
+    overflow: hidden;
+    display: block;
+    margin: 0;
+    padding: 0;
+    background-color: #CCC;
+    border-bottom: 1px solid #AAA;
+}
+
+#sidebar-toolbar {
+    width: 0;
+}
+
+#sidebar-tabs li, #toolbar-tabs li {
+    font-size: 14px;
+    display: block;
+    float: left;
+    margin: 4px 0 -1px 4px;
+    padding: 2px 10px 0 10px;
+    background-color: #CCC;
+    border: 1px solid #AAA;
+    border-radius-topleft: 8px;
+    border-radius-topright: 8px;
+    -moz-border-radius-topleft: 8px;
+    -moz-border-radius-topright: 8px;
+    -webkit-border-top-left-radius: 8px;
+    -webkit-border-top-right-radius: 8px;
+}
+
+#sidebar-tabs, #toolbar-tabs {
+    height: 21px;
+    z-index: 1000;
+/*    overflow: hidden;*/
+}
+
+#sidebar-tabs li:hover, #sidebar-tabs li.active, #toolbar-tabs li:hover, #toolbar-tabs li.active {
+    cursor: default;
+    background-color: #EEE;
+    border-bottom: 1px solid #EEE;
+}
+
+#toolbar-buttons {
+    background-color: #EEE;
+    border-bottom: 1px solid #AAA;
+}
+
+#toolbar-buttons li {
+    display: block;
+    font-size: 12px;
+    padding: 1px 8px;
+    margin: 4px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 8px;
+    float: left;
+}
+
+#toolbar-buttons li:hover {
+    background-color: #777;
+    color: #FFF;
+    cursor: default;
+}