Added history to document view

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

diff --git a/platforma/static/css/master.css b/platforma/static/css/master.css
old mode 100755 (executable)
new mode 100644 (file)
index 9d3efec..d2768be
--- a/platforma/static/css/master.css
+++ b/platforma/static/css/master.css
@@ -13,7 +13,7 @@ body {
     bottom: 0;
     right: 0;;
     width: 13px;
     bottom: 0;
     right: 0;;
     width: 13px;

-    background: #C1C1C1 url(/static/img/gallery.png) no-repeat scroll center center;
+    background: #C1C1C1 url(../img/gallery.png) no-repeat scroll center center;

     border-left: 1px solid #999;
     border-right: 1px solid #999;
     cursor: w-resize;
     border-left: 1px solid #999;
     border-right: 1px solid #999;
     cursor: w-resize;


@@ -23,7 +23,7 @@ body {
     cursor: e-resize;
 }
 
     cursor: e-resize;
 }
 

-#source-editor, #simple-editor {
+#source-editor, #simple-editor, #history-viewer {

     position: absolute;
     top: 25px;
     bottom: 0;
     position: absolute;
     top: 25px;
     bottom: 0;


@@ -32,7 +32,7 @@ body {
     overflow: hidden;
 }
 
     overflow: hidden;
 }
 

-#html-view {
+#html-view, #history-view {

     overflow: auto;
     position: absolute;
     top: 27px;
     overflow: auto;
     position: absolute;
     top: 27px;


@@ -61,7 +61,7 @@ body {
     font-weight: bold;
 }
 
     font-weight: bold;
 }
 

-#header h1 {
+#header h1, #header h1 a {

     margin: 0;
     padding: 0;
     font: 17px Helvetica, Verdana, sans-serif;
     margin: 0;
     padding: 0;
     font: 17px Helvetica, Verdana, sans-serif;


@@ -72,6 +72,11 @@ body {
     line-height: 20px;
 }
 
     line-height: 20px;
 }
 

+#header h1 a {
+    text-decoration: none;
+    color: #222;
+}
+

 #tabs {
     margin: 0;
     padding: 0;
 #tabs {
     margin: 0;
     padding: 0;


@@ -120,11 +125,18 @@ body {
     display: block;
     float: left;
     margin: 4px 0 2px 0;
     display: block;
     float: left;
     margin: 4px 0 2px 0;

-    padding: 0 5px 2px 5px;
+    padding: 2px 5px;

     border: none;
     background: none;
 }
 
     border: none;
     background: none;
 }
 

+.toolbar button img {
+       margin: 0;
+       padding: 0;     
+       margin-bottom: -3px;
+}
+
+

 .toolbar select {
     float: left;
     margin: 1px 5px 1px 0;
 .toolbar select {
     float: left;
     margin: 1px 5px 1px 0;


@@ -137,7 +149,8 @@ body {
     float: left;
     font-size: 11px;
     padding: 0;
     float: left;
     font-size: 11px;
     padding: 0;

-    margin: 2px 5px 0 5px;
+    margin: 4px 5px 0px 5px;
+       vertical-align:baseline;

 }
 
 .toolbar-end {
 }
 
 .toolbar-end {


@@ -185,7 +198,7 @@ p { margin: 0;}
 
 .gallery-image {
     position: absolute;
 
 .gallery-image {
     position: absolute;

-    top: 27px;
+    top: 30px;

     right: 0;
     bottom: 0;
     left: 0;
     right: 0;
     bottom: 0;
     left: 0;


@@ -241,4 +254,63 @@ p { margin: 0;}
     float: left;
     margin-right: 10px;
     margin-top: -6px;
     float: left;
     margin-right: 10px;
     margin-top: -6px;

-}
\ No newline at end of file
+}
+
+
+.xml-iframe {
+       margin-left: 40px;      
+}
+
+/*
+ * CodeMirror 
+ */
+.CodeMirror-line-numbers {
+       background: #e6ddd5;
+       padding-top: 0.35em;    
+}
+
+.CodeMirror-line-numbers div {
+       padding: 0;
+       padding-right: 4px;
+       
+       font-size: 8pt;
+       line-height: 17px;
+       text-align: right;
+       
+       width: 40px;            
+} 
+ 
+/* DIFFS */
+ #history-view table {
+       width: 75%;
+       margin: 1em auto;
+       max-height: 400px;
+       overflow-y: auto;
+ }
+ 
+ #diff-view {
+       border: 2px solid black;
+       background: #fafafa;
+       margin: 1em auto;
+       width: 90%;     
+ }
+ 
+ td.diff_header {
+       display: none;
+ }
+ 
+ td.diff_next {
+       display: none;
+ }
+
+ .diff_sub {
+       background-color: #ef4040;
+ }
+ 
+ .diff_chg {
+       background-color: #efef40;
+ }
+ 
+ .diff_add {
+       background-color: #40ef40;
+ }