Fixed unicode commit messages in Revision.merge_with

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

diff --git a/project/static/css/master.css b/project/static/css/master.css
index 7c794e5..ae51e47 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -343,7 +343,7 @@ body#base button {
     border-width: 1px;
     padding: 0px 0.5em;    
     font-family: Sans-Serif;
-    color: #000;
+    /* color: #000; */
     margin: 2px 4px;
 }
 
@@ -351,6 +351,49 @@ body#base button:hover {
     background-color: #EEE;
 }
 
+/* HTML editor interactive elements */
+
+.html-editarea {
+    border: 2px solid black;
+    background-color: gray;
+    padding: 1px;
+
+    z-index: 2000;
+}
+
+.html-editarea textarea
+{   
+   
+    border: 0px;
+    margin: 0px;    
+    padding: 0px;
+    
+    width: 100%;
+    height: 100%;
+    
+    z-index: 0;
+    font-size: 10pt;
+    background-color: ivory;
+}
+
+.html-editarea p.html-editarea-toolbar {
+    position: absolute;
+    background: gray;
+
+    bottom: -26px;
+    height: 24px;
+    
+    left: 0px;
+    right: 0px;    
+        
+    border: 2px solid black;
+
+    margin: 0px;
+    padding: 0px;
+
+    z-index: 100;
+}
+
 /* ================= */
 /* = Message boxes = */
 /* ================= */
@@ -369,3 +412,4 @@ body#base button:hover {
 .critical {
     background-color: red;
 }
+