Merge branch 'master' into lqc-trunk

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

diff --git a/platforma/static/css/html.css b/platforma/static/css/html.css
index a580ec2..8856068 100755 (executable)
--- a/platforma/static/css/html.css
+++ b/platforma/static/css/html.css
@@ -26,6 +26,10 @@
     text-decoration: none;
 }
 
     text-decoration: none;
 }
 

+.htmlview a:hover {
+    text-decoration: none;
+}
+

 .htmlview h1 {
     font-size: 3em;
     margin: 1.5em 0;
 .htmlview h1 {
     font-size: 3em;
     margin: 1.5em 0;


@@ -210,6 +214,11 @@
     margin: 1em;
 }
 
     margin: 1em;
 }
 

+ .parse-warning .message {
+    color: purple;
+    font-weight: bold;
+}
+

 
 /* Motywy */
 /* ======================== */
 
 /* Motywy */
 /* ======================== */


@@ -239,23 +248,64 @@
     border-right: none;
     
     z-index: 1;
     border-right: none;
     
     z-index: 1;

+    -moz-user-select: -moz-none;
+    -webkit-user-select: none;
+    user-select: none;

 }
 
 }
 

-/* Przypisy */
+/* 
+ * Przypisy
+ */
+
+/* Znaczniki w tekście */

 .htmlview .annotation {    
     vertical-align: super;
     text-decoration: none;
 .htmlview .annotation {    
     vertical-align: super;
     text-decoration: none;

-    font-size: 0.66em;
+    font-size: 0.66em;    

 }
 
 }
 

-.htmlview a:hover {
-    text-decoration: none;
+.htmlview .annotation:before {
+    content: "[" counter(main) "]";
+    counter-increment: main;

 }
 
 }
 

-/* .htmlview .annotation:before {
-    content: "[\2217]";
-} */
+.htmlview .annotation:hover {
+    background-color: #dfdfdf;
+}
+
+*.htmlview *.annotation-inline-box {
+    position: static;
+}
+
+/*
+ * Przypisy w tekście
+ */
+ .htmlview .annotation-inline-box > span[x-annotation-box]
+ {
+     display: none;
+     position: absolute;
+
+     max-width: 36em;
+     
+     font-size: 8pt;
+     line-height: 12pt;
+     font-weight: normal;
+     font-style: normal;
+
+     background: white;
+     border-color: gray;
+     border-width: 2px;
+     border-style: outset;
+     padding: 3px 5px;
+
+     text-decoration: none;
+     z-index: 10;
+ }
+ 

 
 

+/*
+ * Przypisy na końcu utworu (aktualnie nieuzywane)
+ */

 .htmlview .annotations-block {
     counter-reset: secondary;
 }
 .htmlview .annotations-block {
     counter-reset: secondary;
 }


@@ -280,21 +330,6 @@
     counter-increment: secondary;
 }
 
     counter-increment: secondary;
 }
 

-.htmlview span.annotation:before {
-    content: "[" counter(main) "]";
-    counter-increment: main;
-}
-
-.htmlview .annotation:hover {
-    background-color: #dfdfdf;
-}
-
-.parse-warning .message {
-    color: purple;
-    font-weight: bold;
-}
-
-

 /*
  * EDITABLE ELEMENTS
  */
 /*
  * EDITABLE ELEMENTS
  */


@@ -304,17 +339,17 @@
 }
 
 /* focused editable element */
 }
 
 /* focused editable element */

-.htmlview *[x-editable]:hover
+/* .htmlview *[x-editable]:hover

 {    
     
 {    
     

-}
+} */

 
 .htmlview *[x-editable][x-open]
 {
     visibility: hidden;
 }
 
 
 .htmlview *[x-editable][x-open]
 {
     visibility: hidden;
 }
 

-.htmlview *[x-editable] .context-menu {
+.htmlview *[x-editable] > .context-menu {

     position: absolute;
     top: 0px;
     left: -50px;
     position: absolute;
     top: 0px;
     left: -50px;


@@ -331,9 +366,8 @@
 
     margin: 0px;
     padding: 0px;
 
     margin: 0px;
     padding: 0px;

-
-    display: none;
-    visibility: visible;
+    visibility: inherit;
+    display: block;

 
     border-top: 1px solid black;
     border-left: 1px solid black;
 
     border-top: 1px solid black;
     border-left: 1px solid black;


@@ -350,42 +384,53 @@
     z-index: 3000;
 }
 
     z-index: 3000;
 }
 

-.htmlview *[x-editable] *.context-menu * {
+.htmlview *[x-editable] > .context-menu * {

     margin: 0px;
     display: block;
 
     margin: 0px;
     display: block;
 

+    -moz-user-select: -moz-none;
+    -webkit-user-select: none;
+

     padding: 2px;
     cursor: pointer;
     border-bottom: 1px solid black;
 }
 
     padding: 2px;
     cursor: pointer;
     border-bottom: 1px solid black;
 }
 

-.htmlview *[x-editable] *.context-menu *:last-child {    
+.htmlview *[x-editable] > .context-menu *:last-child {

     cursor: pointer;
     border-bottom: none;
 }
 
     cursor: pointer;
     border-bottom: none;
 }
 

-.htmlview *[x-editable] *.context-menu *:hover {
+.htmlview *[x-editable] > .context-menu *:hover {

     background-color: orange;
 }
 
 /*
  * VISIBILITY RULES
  */
     background-color: orange;
 }
 
 /*
  * VISIBILITY RULES
  */

-.htmlview *[x-editable] *.default-menu {
-    display: block;
+.htmlview *[x-editable] > .default-menu {
+    visibility: inherit;

     opacity: 0.4;
 }
 
     opacity: 0.4;
 }
 

-.htmlview *[x-editable] *.default-menu:hover {
+.htmlview *[x-editable] > .default-menu:hover {

     opacity: 1;
 }
 
     opacity: 1;
 }
 

-.htmlview *[x-editable][x-open] *.default-menu {
-    display: none;
+.htmlview *[x-annotation-box][x-editable] > .default-menu {
+    opacity: 1;

 }
 
 }
 

-.htmlview *[x-editable][x-open] *.edit-menu {
-    display: block;
+.htmlview *[x-editable][x-open] > .default-menu {
+    visibility: hidden;
+}
+
+.htmlview *[x-editable] > .edit-menu {
+    visibility: hidden;
+}
+
+.htmlview *[x-editable][x-open] > .edit-menu {
+    visibility: visible;

 }
 
 .html-editarea {
 }
 
 .html-editarea {