Merging in actions branch

[fnpeditor.git] / src / editor / modules / documentCanvas / nodes.less

diff --git a/src/editor/modules/documentCanvas/nodes.less b/src/editor/modules/documentCanvas/nodes.less
index 367e4aa..bbb65d4 100644 (file)
--- a/src/editor/modules/documentCanvas/nodes.less
+++ b/src/editor/modules/documentCanvas/nodes.less
@@ -2,7 +2,6 @@
     font-size: 14px;
     display: inline;
     margin: 0 1px;
     font-size: 14px;
     display: inline;
     margin: 0 1px;

-    border: 1px solid transparent;

     white-space: pre-wrap;
 }
 
     white-space: pre-wrap;
 }
 


@@ -17,6 +16,12 @@
     padding: 1px 1px;
 }
 
     padding: 1px 1px;
 }
 

+.grid-on {
+    [wlxml-tag] {
+        .rng-common-hoveredNode;
+    }
+}
+

 [wlxml-tag=span] {
     min-width: 10px;
 }
 [wlxml-tag=span] {
     min-width: 10px;
 }


@@ -32,10 +37,6 @@
     margin-bottom: 10px;
 }
 
     margin-bottom: 10px;
 }
 

-[wlxml-tag=section] [wlxml-tag=section] {
-    margin-left:10px;
-}
-

 [wlxml-class|="cite"] {
     font-style: italic;
 }
 [wlxml-class|="cite"] {
     font-style: italic;
 }


@@ -68,10 +69,6 @@
     text-decoration: underline;
 }
 
     text-decoration: underline;
 }
 

-[wlxml-class|="p"] {
-    text-indent: 1.5em;
-}
-

 [wlxml-class|="emp"] {
     font-style: italic;
 }
 [wlxml-class|="emp"] {
     font-style: italic;
 }


@@ -82,10 +79,16 @@
 
 [wlxml-class|="list"] {
 
 
 [wlxml-class|="list"] {
 

-     [wlxml-class|="item"] {
-        display: list-item;
+
+    > * > [wlxml-class|="item"] {

         margin-left: 10px;
         padding-left: 5px;
         margin-left: 10px;
         padding-left: 5px;

+        
+        &:before {
+            content: '\2022';
+            margin-right:10px;
+            padding-right:10px;
+        }

     }
 }
 
     }
 }
 


@@ -100,7 +103,7 @@
 
     counter-reset: myitem;
 
 
     counter-reset: myitem;
 

-    > [wlxml-class="item"] {
+    > * > [wlxml-class="item"] {

         counter-increment: myitem;
         margin-left: 10px;
         padding-left: 5px;
         counter-increment: myitem;
         margin-left: 10px;
         padding-left: 5px;


@@ -145,4 +148,18 @@
     [wlxml-class='gap'] {
         display: inline;
     }
     [wlxml-class='gap'] {
         display: inline;
     }

+}
+
+[wlxml-class="gap"] {
+    &:before, &:after {
+        color: darken(@blue, 10%);
+        font-weight: bold;
+        //vertical-align: super;
+    }
+    &:before {
+        content: "(";
+    }
+    &:after {
+        content: ")";
+    }

 }
\ No newline at end of file
 }
\ No newline at end of file