From af3ffa21cede6f4e547a18999d764ec8ee07daa4 Mon Sep 17 00:00:00 2001 From: zuber Date: Thu, 20 Aug 2009 17:13:19 +0200 Subject: [PATCH 1/1] =?utf8?q?Podzielenie=20paska=20z=20przyciskami=20na?= =?utf8?q?=20oddzielne=20paski=20dla=20g=C5=82=C3=B3wnego=20panelu=20i=20d?= =?utf8?q?la=20panelu=20bocznego.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- project/static/css/master.css | 28 +++++++++++++++++------- project/templates/explorer/file_xml.html | 28 ++++++++++++++++-------- 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/project/static/css/master.css b/project/static/css/master.css index c31c4fee..6b53ec5c 100644 --- a/project/static/css/master.css +++ b/project/static/css/master.css @@ -74,10 +74,13 @@ label { overflow-y: scroll; } +#whatever { + float: left; +} + #images-wrap { /* width: 0px;*/ height: 480px; - border-right: 1px solid #999; overflow-y: scroll; overflow-x: hidden; background-color: #fff; @@ -91,8 +94,10 @@ label { } #toggle-sidebar { + border-left: 1px solid #999; + border-right: 1px solid #999; background-color: #DDD; - width: 7px; + width: 8px; height: 100%; float: left; } @@ -141,15 +146,22 @@ p { width: 400%; } -#toolbar-tabs li { +#sidebar-toolbar, #sidebar-toolbar ol { + overflow: hidden; + display: block; + margin: 0; + padding: 0; + background-color: #CCC; + border-bottom: 1px solid #AAA; +} + +#sidebar-tabs li, #toolbar-tabs li { font-size: 14px; display: block; float: left; - margin: 4px 4px 0 0; + margin: 4px 0 -1px 4px; padding: 2px 10px 0 10px; - border-left: 1px solid #EEE; - border-right: 1px solid #AAA; - margin-bottom: -1px; + background-color: #CCC; border: 1px solid #AAA; border-radius-topleft: 8px; border-radius-topright: 8px; @@ -159,7 +171,7 @@ p { -webkit-border-top-right-radius: 8px; } -#toolbar-tabs li:hover, #toolbar-tabs li.active { +#sidebar-tabs li:hover, #sidebar-tabs li.active, #toolbar-tabs li:hover, #toolbar-tabs li.active { cursor: default; background-color: #EEE; border-bottom: 1px solid #EEE; diff --git a/project/templates/explorer/file_xml.html b/project/templates/explorer/file_xml.html index b78e3dee..e4c73712 100644 --- a/project/templates/explorer/file_xml.html +++ b/project/templates/explorer/file_xml.html @@ -19,8 +19,9 @@ function resizePanels() { $('iframe').width($(window).width() - $('#sidebar').outerWidth()); $('iframe').height($(window).height() - 100); - $('#images-wrap, #toggle-sidebar').height($(window).height() - 100); - $('#images-wrap').width($('#sidebar').width() - 8); + $('#toggle-sidebar').height($(window).height() - 55); + $('#images-wrap').height($(window).height() - 82) + $('#images-wrap, #sidebar-toolbar').width($('#sidebar').width() - 10); } $('#toggle-sidebar').toggle(function() { @@ -114,19 +115,28 @@ {% block breadcrumbs %}Platforma Redakcyjna ❯ plik {{ hash }}{% endblock breadcrumbs %} {% block maincontent %} - {% toolbar %} -