height wip: first working solution

diff --git a/modules/documentCanvas/documentCanvas.less b/modules/documentCanvas/documentCanvas.less
index 2dcf8ac..acfc4c1 100644 (file)
--- a/modules/documentCanvas/documentCanvas.less
+++ b/modules/documentCanvas/documentCanvas.less
@@ -1,14 +1,23 @@
 @import 'wlxml.less';\r
 \r
 @import 'wlxml.less';\r
 \r

+#rng-module-documentCanvas {\r
+   height: 100%;\r
+}\r
+\r
+#rng-module-documentCanvas-mainArea {\r
+   height: 100%;\r
+   margin-bottom: 20px;\r
+}\r
+\r

 #rng-module-documentCanvas-contentWrapper {\r
     border-color: #ddd;\r
     border-style: solid;\r
     border-width: 1px;\r
     float:left;\r
 #rng-module-documentCanvas-contentWrapper {\r
     border-color: #ddd;\r
     border-style: solid;\r
     border-width: 1px;\r
     float:left;\r

-    width: 600px;\r
-    height: 450px;\r
+    width: 100%;\r
+    height: 100%;\r

     overflow-y: scroll;\r
     overflow-y: scroll;\r

-    padding: 5px 10px;\r
+    padding: 0 10px;\r

     \r
     &::-webkit-scrollbar {\r
         .rng-mixin-scrollbar;\r
     \r
     &::-webkit-scrollbar {\r
         .rng-mixin-scrollbar;\r

diff --git a/modules/documentToolbar/documentToolbar.less b/modules/documentToolbar/documentToolbar.less
index 0686e38..6189f32 100644 (file)
--- a/modules/documentToolbar/documentToolbar.less
+++ b/modules/documentToolbar/documentToolbar.less
@@ -1,5 +1,5 @@
 .rng-module-documentToolbar {\r
 .rng-module-documentToolbar {\r

-    margin: -15px 0 10px 0;\r
+    margin: 0 0 10px 0;\r

     white-space:nowrap; \r
     word-spacing:0;\r
     \r
     white-space:nowrap; \r
     word-spacing:0;\r
     \r

diff --git a/modules/rng/editingLayout.html b/modules/rng/editingLayout.html
index c8d5a3d..752a973 100644 (file)
--- a/modules/rng/editingLayout.html
+++ b/modules/rng/editingLayout.html
@@ -1,4 +1,4 @@
-<div>\r
+<div class="fnp-module-rng-editingLayout">\r

     <div fnpjs-place="toolbar"></div>\r
     <div class="rng-module-rng2-left" fnpjs-place="leftColumn"></div>\r
     <div class="rng-module-rng2-right" fnpjs-place="rightColumn"></div>\r
     <div fnpjs-place="toolbar"></div>\r
     <div class="rng-module-rng2-left" fnpjs-place="leftColumn"></div>\r
     <div class="rng-module-rng2-right" fnpjs-place="rightColumn"></div>\r

diff --git a/modules/rng/editingLayout.less b/modules/rng/editingLayout.less
index 9f583c5..0418395 100644 (file)
--- a/modules/rng/editingLayout.less
+++ b/modules/rng/editingLayout.less
@@ -1,13 +1,13 @@
 .rng-module-rng2-left {\r
 .rng-module-rng2-left {\r

-    float: left;\r
-    width: 600px;\r
+    /*float: left;\r
+    width: 600px;*/\r

 }\r
 \r
 .rng-module-rng2-right {\r
 }\r
 \r
 .rng-module-rng2-right {\r

-    float: right;\r
+    /*float: right;\r

     position: relative;\r
     width: 258px;\r
     position: relative;\r
     width: 258px;\r

-    margin-left: 50px;\r
+    margin-left: 50px;*/\r

 \r
     border-width: 1px 1px 1px 1px;\r
     border-style: solid;\r
 \r
     border-width: 1px 1px 1px 1px;\r
     border-style: solid;\r


@@ -54,4 +54,35 @@
 .rng-module-rng2-statusBar {\r
     margin: 10px 5px;\r
     font-size:0.9em;\r
 .rng-module-rng2-statusBar {\r
     margin: 10px 5px;\r
     font-size:0.9em;\r

+}\r
+\r
+.fnp-module-rng-editingLayout {\r
+\r
+    [fnpjs-place="statusBar"] {\r
+        position: absolute;\r
+        bottom: 0;\r
+        left: 0;\r
+        right: 0;\r
+        height: 30px;\r
+        \r
+    }\r
+    \r
+    [fnpjs-place="leftColumn"], [fnpjs-place="rightColumn"] {\r
+        position: absolute;\r
+        top: 30px; //\r
+        bottom: 50px; //\r
+    }\r
+    \r
+    [fnpjs-place="leftColumn"] {\r
+        left:0;\r
+        right: 450px;\r
+    }\r
+    \r
+    [fnpjs-place="rightColumn"] {\r
+        right: 20px;\r
+        left: 830px;\r
+        \r
+    }\r
+\r
+\r

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

diff --git a/modules/rng/mainLayout.less b/modules/rng/mainLayout.less
index 08db00d..eb51ce4 100644 (file)
--- a/modules/rng/mainLayout.less
+++ b/modules/rng/mainLayout.less
@@ -1,5 +1,9 @@
 #rng-module-rng-mainLayout {\r
 #rng-module-rng-mainLayout {\r

-    position: relative;\r
+    position: fixed;\r
+    top: 5px;\r
+    bottom: 5px;\r
+    left: 60px;\r
+    right: 60px;\r

     \r
     [fnpjs-place="messages"] {\r
         position: absolute;\r
     \r
     [fnpjs-place="messages"] {\r
         position: absolute;\r


@@ -11,4 +15,25 @@
     [fnpjs-place="topPanel"] {\r
         float: right;\r
     }\r
     [fnpjs-place="topPanel"] {\r
         float: right;\r
     }\r

+    \r
+    [fnpjs-place="mainView"] {\r
+        position: absolute;\r
+        top: 32px;\r
+        left:0;\r
+        right:0;\r
+        bottom:0; \r
+        \r
+        .rng-view-tabs {\r
+            position: relative;\r
+            height: 100%;\r
+        }\r
+        \r
+        .rng-view-tabs-content {\r
+            position: absolute;\r
+            top: 45px;\r
+            left: 0;\r
+            right: 0;\r
+            bottom: 0;\r
+        }\r
+    }\r

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