Lepsze obsługiwanie nieudanych merge oraz podawanie w vstorage.all_pages() jedynie...

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

diff --git a/platforma/static/css/html.css b/platforma/static/css/html.css
index 26ee658..57eed6d 100755 (executable)
--- a/platforma/static/css/html.css
+++ b/platforma/static/css/html.css
@@ -247,18 +247,26 @@
     font-variant: normal;
     text-decoration: none;
 
     font-variant: normal;
     text-decoration: none;
 

-    padding: 0.2em;

 
 

-    background-color: #efefef;
+    background-color: #fff;

     
     

-    border: 1px solid gray;
-    border-left: 2px dotted gray;
+/*    border: 1px solid gray;
+

     border-right: none;
     border-right: none;

-    
+*/    

     z-index: 1;
     -moz-user-select: -moz-none;
     -webkit-user-select: none;
     user-select: none;
     z-index: 1;
     -moz-user-select: -moz-none;
     -webkit-user-select: none;
     user-select: none;

+    margin-right: -12em;
+    text-align: left;
+}
+
+.htmlview .motyw[x-editable] {
+    border-left: 4px solid #DDD;
+    padding: 0.2em 0.2em 0.2em 0.5em;
+    margin-top: 0.2em;
+

 }
 
 /* 
 }
 
 /* 


@@ -269,7 +277,7 @@
 .htmlview .annotation {    
     vertical-align: super;
     text-decoration: none;
 .htmlview .annotation {    
     vertical-align: super;
     text-decoration: none;

-    font-size: 0.66em;    
+/*    font-size: 10px;    */

 }
 
 .htmlview .annotation:before {
 }
 
 .htmlview .annotation:before {


@@ -344,6 +352,9 @@
 
 .htmlview *[x-editable] {    
     position: relative;
 
 .htmlview *[x-editable] {    
     position: relative;

+    padding: 2px;
+    margin-left: 0;
+    border: 1px solid #FFF;

 }
 
 /* focused editable element */
 }
 
 /* focused editable element */


@@ -359,29 +370,29 @@
 
 .edit-button {
     position: absolute;
 
 .edit-button {
     position: absolute;

-    top: auto;
-    bottom: auto;
-    left: -50px;
+    top: -21px;
+    left: -1px;

     width: 50px;
     width: 50px;

-    height: 16px;
+    height: 21px;

     
     display: block;
 /*    margin: 4px 0 2px 0;*/
     
     display: block;
 /*    margin: 4px 0 2px 0;*/

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

     border: none;
     border: none;

-    background: none;
+    background-color: #FAFAFA;

     
     

-    z-index: 3000;
-    color: #777;
+/*    z-index: 3000;*/
+/*    color: #FFF;
+    z-index: 1500;
+*/    border: 1px solid #DDD;
+    border-bottom: none;

 }
 
 
 .edit-button:hover, .edit-button:active {
 }
 
 
 .edit-button:hover, .edit-button:active {

-    background: #A2A2A2;
+/*    color: #FFF;*/
+    background-color: #999;

     color: #FFF;
     color: #FFF;

-    -webkit-border-radius: 10px;
-    -moz-border-radius: 10px;
-    border-radius: 10px;

 }
 
 /*
 }
 
 /*


@@ -509,4 +520,14 @@
 
 #theme-edit-dialog .theme-mutli-list input:checked + label {
     font-weight: bold;
 
 #theme-edit-dialog .theme-mutli-list input:checked + label {
     font-weight: bold;

-}*/
\ No newline at end of file
+}*/
+
+.out-of-flow-text {
+    border: 1px solid #C8B849;
+    background-color: #D4CB9C;
+    white-space: pre;
+    overflow: auto;
+    margin: 1.5em 0 0;
+    font-family: monospace;
+    font-size: 10pt;
+}
\ No newline at end of file