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 03bcd21..1efa2d6 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -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 {
@@ -133,7 +138,7 @@ p {
     margin: 0;
     padding: 0;
     background-color: #CCC;
-    border-bottom: 1px solid #AAA;
+    border-top: 1px solid #AAA;
 }
 
 #toolbar {
@@ -141,15 +146,26 @@ p {
     width: 400%;
 }
 
-#toolbar-tabs li {
+#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 4px 0 0;
+    margin: 4px 0 -1px 4px;
     padding: 2px 10px 0 10px;
-    border-left: 1px solid #EEE;
-    border-right: 1px solid #AAA;
-    margin-bottom: -1px;
+    background-color: #CCC;
     border: 1px solid #AAA;
     border-radius-topleft: 8px;
     border-radius-topright: 8px;
@@ -159,7 +175,13 @@ p {
     -webkit-border-top-right-radius: 8px;
 }
 
-#toolbar-tabs li:hover, #toolbar-tabs li.active {
+#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;
@@ -167,6 +189,7 @@ p {
 
 #toolbar-buttons {
     background-color: #EEE;
+    border-bottom: 1px solid #AAA;
 }
 
 #toolbar-buttons li {