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 fd5af3b..8856068 100755 (executable)
--- a/platforma/static/css/html.css
+++ b/platforma/static/css/html.css
@@ -248,6 +248,9 @@
     border-right: none;
     
     z-index: 1;
     border-right: none;
     
     z-index: 1;

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

 }
 
 /* 
 }
 
 /* 


@@ -270,11 +273,6 @@
     background-color: #dfdfdf;
 }
 
     background-color: #dfdfdf;
 }
 

-.htmlview .annotation-inline-box[x-focused] > .annotation {
-    background-color: #860000;
-    color: #dfdfdf;
-}
-

 *.htmlview *.annotation-inline-box {
     position: static;
 }
 *.htmlview *.annotation-inline-box {
     position: static;
 }


@@ -303,11 +301,6 @@
      text-decoration: none;
      z-index: 10;
  }
      text-decoration: none;
      z-index: 10;
  }

-
-.htmlview .annotation-inline-box[x-focused] > span[x-annotation-box],
-.htmlview .annotation-inline-box:hover > span[x-annotation-box] {
-    display: block;
- }

  
 
 /*
  
 
 /*


@@ -337,16 +330,10 @@
     counter-increment: secondary;
 }
 
     counter-increment: secondary;
 }
 

-
-
-
-

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

-
-

 .htmlview *[x-editable] {    
     padding-left: 3px;
 }
 .htmlview *[x-editable] {    
     padding-left: 3px;
 }


@@ -401,6 +388,9 @@
     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;


@@ -427,6 +417,10 @@
     opacity: 1;
 }
 
     opacity: 1;
 }
 

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

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