Added "merge_url" to document meta-data.

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

diff --git a/project/static/css/master.css b/project/static/css/master.css
index 1a110b5..a3857e6 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -1,6 +1,6 @@
 body {
     margin: 0;
 body {
     margin: 0;

-    font: 10pt Helvetica, Verdana, sans-serif;
+    font: 12px Helvetica, Verdana, sans-serif;

     overflow: hidden;
     background: #AAA;
 }
     overflow: hidden;
     background: #AAA;
 }


@@ -37,6 +37,7 @@ body {
     background-color: white;
 }
 
     background-color: white;
 }
 

+/*

 ul {
     margin: 20px;
     padding: 0;
 ul {
     margin: 20px;
     padding: 0;


@@ -46,7 +47,7 @@ li {
     margin: 0;
     padding: 0;
     list-style: none;
     margin: 0;
     padding: 0;
     list-style: none;

-}
+} */

 
 a {
     text-decoration: none;
 
 a {
     text-decoration: none;


@@ -358,12 +359,59 @@ text#commit-dialog-message {
     border-right: 1px solid #999;
     height: 100%;
     background-color: #CCC;
     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%;
 }
 
 .panel-container {
     height: 100%;

+    position: relative;
+}
+
+.content-view {
+    position: absolute;
+    top: 20px;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    overflow: none;
+}
+
+.panel-container select {
+    z-index: 1100;

 }
 
 .xmlview {
     height: 100%;
 }
 }
 
 .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;
+}
+
+.buttontoolbarview {
+    display: block;
+    background-color: #CCC;
+}
+
+.buttontoolbarview a {
+    color: #000;
+    text-decoration: none;
+}