From fcf3ec2a7cdac14c85d30d81dce86be7b60ce0bb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Mon, 17 Jun 2013 16:00:05 +0200 Subject: [PATCH] height wip: first working solution --- modules/documentCanvas/documentCanvas.less | 15 ++++++-- modules/documentToolbar/documentToolbar.less | 2 +- modules/rng/editingLayout.html | 2 +- modules/rng/editingLayout.less | 39 ++++++++++++++++++-- modules/rng/mainLayout.less | 27 +++++++++++++- 5 files changed, 75 insertions(+), 10 deletions(-) diff --git a/modules/documentCanvas/documentCanvas.less b/modules/documentCanvas/documentCanvas.less index 2dcf8ac..acfc4c1 100644 --- a/modules/documentCanvas/documentCanvas.less +++ b/modules/documentCanvas/documentCanvas.less @@ -1,14 +1,23 @@ @import 'wlxml.less'; +#rng-module-documentCanvas { + height: 100%; +} + +#rng-module-documentCanvas-mainArea { + height: 100%; + margin-bottom: 20px; +} + #rng-module-documentCanvas-contentWrapper { border-color: #ddd; border-style: solid; border-width: 1px; float:left; - width: 600px; - height: 450px; + width: 100%; + height: 100%; overflow-y: scroll; - padding: 5px 10px; + padding: 0 10px; &::-webkit-scrollbar { .rng-mixin-scrollbar; diff --git a/modules/documentToolbar/documentToolbar.less b/modules/documentToolbar/documentToolbar.less index 0686e38..6189f32 100644 --- a/modules/documentToolbar/documentToolbar.less +++ b/modules/documentToolbar/documentToolbar.less @@ -1,5 +1,5 @@ .rng-module-documentToolbar { - margin: -15px 0 10px 0; + margin: 0 0 10px 0; white-space:nowrap; word-spacing:0; diff --git a/modules/rng/editingLayout.html b/modules/rng/editingLayout.html index c8d5a3d..752a973 100644 --- a/modules/rng/editingLayout.html +++ b/modules/rng/editingLayout.html @@ -1,4 +1,4 @@ -
+
diff --git a/modules/rng/editingLayout.less b/modules/rng/editingLayout.less index 9f583c5..0418395 100644 --- a/modules/rng/editingLayout.less +++ b/modules/rng/editingLayout.less @@ -1,13 +1,13 @@ .rng-module-rng2-left { - float: left; - width: 600px; + /*float: left; + width: 600px;*/ } .rng-module-rng2-right { - float: right; + /*float: right; position: relative; width: 258px; - margin-left: 50px; + margin-left: 50px;*/ border-width: 1px 1px 1px 1px; border-style: solid; @@ -54,4 +54,35 @@ .rng-module-rng2-statusBar { margin: 10px 5px; font-size:0.9em; +} + +.fnp-module-rng-editingLayout { + + [fnpjs-place="statusBar"] { + position: absolute; + bottom: 0; + left: 0; + right: 0; + height: 30px; + + } + + [fnpjs-place="leftColumn"], [fnpjs-place="rightColumn"] { + position: absolute; + top: 30px; // + bottom: 50px; // + } + + [fnpjs-place="leftColumn"] { + left:0; + right: 450px; + } + + [fnpjs-place="rightColumn"] { + right: 20px; + left: 830px; + + } + + } \ No newline at end of file diff --git a/modules/rng/mainLayout.less b/modules/rng/mainLayout.less index 08db00d..eb51ce4 100644 --- a/modules/rng/mainLayout.less +++ b/modules/rng/mainLayout.less @@ -1,5 +1,9 @@ #rng-module-rng-mainLayout { - position: relative; + position: fixed; + top: 5px; + bottom: 5px; + left: 60px; + right: 60px; [fnpjs-place="messages"] { position: absolute; @@ -11,4 +15,25 @@ [fnpjs-place="topPanel"] { float: right; } + + [fnpjs-place="mainView"] { + position: absolute; + top: 32px; + left:0; + right:0; + bottom:0; + + .rng-view-tabs { + position: relative; + height: 100%; + } + + .rng-view-tabs-content { + position: absolute; + top: 45px; + left: 0; + right: 0; + bottom: 0; + } + } } \ No newline at end of file -- 2.20.1