Merge branch 'master' into view-refactor

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

diff --git a/project/static/css/master.css b/project/static/css/master.css
index 2eaf801..6ba367b 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -35,7 +35,6 @@ body {
     top: 2.4em; left: 0px; right: 0px; bottom: 0px;
     overflow: auto;    
     background-color: white;
-    padding: 0.2em 1em;
 }
 
 ul {
@@ -107,8 +106,8 @@ label {
 /* ========== */
 
 #panels {
-    position: absolute;
-    bottom: 0px; left: 0px; right: 0px; top: 0px;
+    height: 100%;
+    width: 100%;
 }
 
 .panel-wrap {
@@ -161,25 +160,43 @@ label {
 }
 
 /* Toolbars with select box to change panel contents*/
-.panel-toolbar {
+.panel-wrap .panel-toolbar {
     position: absolute;
-    top: 0px; left:0px; right: 0px; height: 24px;
+    top: 0px; left:0px; right: 0px; height: 26px;
+    padding: 0px;
 
-    padding: 0 0 2px 0;
     /* border-top: 1px solid #AAA; */
     border-bottom: 1px solid #AAA;
+    z-index: 80;
+}
+
+.panel-toolbar label {
+    display: inline;
+}
+
+.panel-toolbar p {
+    /* position: relative; */
     font-size: 12px;
-    line-height: 20px;
+    line-height: 26px;
     background-color: #DDD;
     white-space: nowrap;
     overflow: hidden;
-    z-index: 80;
+    
+    margin: 0px;
+    padding: 0px 1em;
+
+    width: auto;
+    height: 26px;
 }
 
-.panel-toolbar label {
-    display: block;
-    float: left;
-    margin: 0 10px 0 2px;
+.panel-toolbar .toolbar-button-groups-container .panel-toolbar-extra button {
+    /* this is uber specific */
+    font-size: 12px;
+    font-family: Sans-Serif;
+    padding: 2px 5px;
+    margin: 0px;
+    border: 0px solid black;
+    vertical-align: bottom;
 }
 
 /* Slider between panels */
@@ -207,6 +224,8 @@ label {
 }
 
 
+
+
 /* ================= */
 /* = Gallery panel = */
 /* ================= */
@@ -215,38 +234,6 @@ label {
     overflow-y: scroll;
 }
 
-
-/* ==================== */
-/* = XML Editor panel = */
-/* ==================== */
-
-.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 = */
 /* =========================== */
@@ -334,3 +321,81 @@ div.isection p {
     background-color: yellow;
     border-color: yellow;   
 }
+
+/* Commit dialog */
+#commit-dialog-error-empty-message {
+    color: red;
+    display: none;
+    font-weight: bold;
+}
+
+text#commit-dialog-message {
+    width: 80%;
+    margin: auto;
+}
+
+#split-dialog .container-box form {
+    margin: 0.2em 1em;
+}
+
+#split-dialog .container-box fieldset {
+    margin: 0.5em;
+}
+
+/* ======= */
+/* = New = */
+/* ======= */
+#splitview {
+    width: 100%;
+    height: 100%;
+    padding: 0;
+    margin: 0;
+}
+
+.splitview-splitbar {
+    width: 5px;
+    border-left: 1px solid #999;
+    border-right: 1px solid #999;
+    height: 100%;
+    background-color: #CCC;
+    z-index: 100;
+}
+
+.splitview-overlay {
+    z-index: 90;
+    background: #FFF;
+    opacity: 0.5;
+}
+
+.panel-container {
+    height: 100%;
+    position: relative;
+}
+
+.content-view {
+    position: absolute;
+    top: 20px;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    overflow: none;
+}
+
+.xmlview {
+    height: 100%;
+}
+
+.view-overlay {
+    z-index: 1000;
+    background: #FFF;
+    opacity: 0.8;
+    text-align: center;
+    text-valign: center;
+}
+
+.view-overlay p {
+    display: block;
+    position: relative;
+    top: auto;
+    bottom: auto;
+    height: 40px;