From: Lukasz Rekucki Date: Mon, 24 Aug 2009 07:55:49 +0000 (+0200) Subject: Merge branch 'lq-editor-refactor' X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/cb87c787916de7712a4f9fb638715e6185804711?ds=sidebyside;hp=-c Merge branch 'lq-editor-refactor' --- cb87c787916de7712a4f9fb638715e6185804711 diff --combined project/static/css/master.css index 5f567e00,bbd98155..71c9fb4b --- a/project/static/css/master.css +++ b/project/static/css/master.css @@@ -4,21 -4,10 +4,21 @@@ body overflow: hidden; } -#breadcrumbs { - padding: 2px 10px; +#header { + position: relative; + padding: 2px 0.5em; background-color: #CDCDCD; - border-bottom: 1px solid #858585; + border-bottom: 1px solid black; + clear: both; +} + +#header #breadcrumbs { + +} + +#header #login_info { + position: absolute; + right: 1em; } ul { @@@ -88,19 -77,52 +88,52 @@@ label /* ========== */ /* = Panels = */ /* ========== */ + + #panels { + position: absolute; + bottom: 0px; left: 0px; right: 0px; top: 50px; + } + + .panels-mouse-overlay { + position: absolute; + top: 0px; bottom: 0px; left: 0px; right: 0px; + z-index: 0; + background: transparent; + } + .panel-wrap { overflow: hidden; + position: absolute; /* absolute to relation with #panels */ + top: 0px; + bottom: 0px; } #left-panel-wrap { - float: left; - width: 8px; + left: 0px; + width: 8px; /* initial width */ } + #right-panel-wrap { + right: 0px; + width: auto; + left: 8px; /* initial width of the left panel */ + } + + /* contents */ + .panel-contents { + position: absolute; + top: 22px; left: 0px; right: 8px; bottom:0px; + } + + .panel-wrap.no-slider .panel-contents { + right: 0px; + } /* Toolbars with select box to change panel contents*/ .panel-toolbar { - height: 20px; + position: absolute; + top: 0px; left:0px; right: 0px; height: 20px; + padding: 0 0 2px 0; border-top: 1px solid #AAA; border-bottom: 1px solid #AAA; @@@ -118,16 -140,16 +151,16 @@@ } /* Slider between panels */ - #slider { + .panel-wrap .panel-slider { + position: absolute; + + top: 0px; bottom: 0px; right: 0px; width: 6px; + border-left: 1px solid #999; border-right: 1px solid #999; - background-color: #DDD; - width: 8px; - height: 100%; - float: left; } - #slider:hover { + .panel-wrap .panel-slider:hover { background-color: #999; cursor: col-resize; } @@@ -216,18 -238,3 +249,18 @@@ color: #FFF; cursor: default; } + + +div.isection { + margin: 1em auto; + border: 1px solid black; + padding: 0.5em 2em; + background: #9f9ffa; + + width: 60%; +} + +div.isection p { + margin: 0.5em 1em; +} +