Merge branch 'production'

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

diff --git a/redakcja/static/css/html.css b/redakcja/static/css/html.css
index bd710a8..3072d9b 100644 (file)
--- a/redakcja/static/css/html.css
+++ b/redakcja/static/css/html.css
@@ -26,14 +26,14 @@
  font-size: 8px;
  line-height: 8px;
  margin-bottom: 4px;
- 
+
  padding: 3px 4px;
  vertical-align: super;
  background-color:#add8e6;
  margin-left: -80px;
  width: 70px;
  text-align: center;
- 
+
  -webkit-border-radius: 4px;
  }
  */
@@ -210,18 +210,18 @@ not(.strofa) > *[x-verse]::after {
 .htmlview .motto_container {
        display: inline-block;
        margin: 1.5em 0 0;
-       clear: right;   
+       clear: right;
 }
 
 .htmlview .motto {
     text-align: justify;
-    font-style: italic;    
+    font-style: italic;
 }
 
 .htmlview p.motto_podpis {
        position: relative;
        right: -3em;
-       text-align: right;      
+       text-align: right;
 }
 
 .htmlview div.fragment {
@@ -333,14 +333,19 @@ div[x-node] > .uwaga {
     left: auto;
     clear: right;
     width: 10em;
+
+    font-style: normal;
     font-weight: normal;
-    font-size: 13px;
-    line-height: 18px;
     font-variant: normal;
+    letter-spacing: 0;
+    text-transform: none;
     text-decoration: none;
+
+    font-size: 13px;
+    line-height: 18px;
     background-color: #fff;
     /*    border: 1px solid gray;
-     
+
      border-right: none;
      */
     z-index: 1;
@@ -351,6 +356,10 @@ div[x-node] > .uwaga {
     text-align: left;
 }
 
+.htmlview .noncanon {
+    color: #d00;
+}
+
 .htmlview .motyw[x-editable] {
     border-left: 4px solid #DDD;
     padding: 0.2em 0.2em 0.2em 0.5em;
@@ -361,6 +370,10 @@ div[x-node] > .uwaga {
  * Przypisy
  */
 /* Znaczniki w tekście */
+.annotation {
+    font-style: normal;
+}
+
 .htmlview .annotation:before {
     content: "[" counter(main) "]";
     counter-increment: main;
@@ -370,7 +383,10 @@ div[x-node] > .uwaga {
 }
 
 .htmlview .annotation:hover {
-    background-color: #96e0e4;
+    background-color: #ffcccc;
+}
+.htmlview .pe .annotation:hover {
+    background-color: #96e0e4;*/
 }
 *.htmlview *.annotation-inline-box {
     position: static;
@@ -467,8 +483,8 @@ div[x-node] > .uwaga {
     left: 70px;
 }
 
-.edit-button:hover, .edit-button:active, 
-.delete-button:hover, .delete-button:active, 
+.edit-button:hover, .edit-button:active,
+.delete-button:hover, .delete-button:active,
 .accept-button:hover, .accept-button:active {
     /*    color: #FFF;*/
     background-color: #999;
@@ -566,4 +582,4 @@ div[x-node] > .uwaga {
     margin: -0.25em;
     padding: 0.25em;
     border: 1px solid orange;
-}
\ No newline at end of file
+}