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 12085b2..604b69a 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -121,6 +121,7 @@ label {
 .panel-content {
        position: absolute;
        overflow: auto;
+       overflow-x: hidden;
        top: 22px; left: 0px; bottom:0px; right: 0px;
 }
 
@@ -143,6 +144,10 @@ label {
        right: 0px;
 }
 
+.panel-wrap.last-panel .panel-slider {
+    display: none;
+}
+
 /* Toolbars with select box to change panel contents*/
 .panel-toolbar {
     position: absolute;
@@ -189,6 +194,7 @@ label {
        background-color: #DDD;
 }
 
+
 /* ================= */
 /* = Gallery panel = */
 /* ================= */
@@ -234,8 +240,6 @@ label {
 
 .toolbar-tabs {
     height: 21px;
-/*    z-index: 1000;*/
-/*    overflow: hidden;*/
 }
 
 .toolbar-tabs li:hover, .toolbar-tabs li.active {
@@ -266,6 +270,33 @@ label {
     cursor: default;
 }
 
+.change-font-size {
+    width: 45px;
+    height: 18px;
+    padding: 3px 0 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+}
+
+.change-font-size div {
+    float: left;
+    text-align: center;
+    width: 20px;
+    font-size: 13px;
+    margin: 1px;
+    cursor: default;
+    border-radius: 2px;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+}
+
+.change-font-size div:hover {
+    background-color: #EEE;
+    border: 1px solid #AAA;
+    margin: 0;
+}
+
 /* =========================== */
 /* = DublinCore Editor panel = */
 /* =========================== */