diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-05-07 20:52:31 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-05-07 20:52:31 +0200 |
| commit | 8d0a2dddb9797f993fd0149b55aa5aeabafd07cc (patch) | |
| tree | ead4a0c40a152a4fdeb5efdabf2b9c76a66500fd /chimere/static | |
| parent | 8b8ec8956c1920c367fce688931dadd5673601f7 (diff) | |
| download | Chimère-8d0a2dddb9797f993fd0149b55aa5aeabafd07cc.tar.bz2 Chimère-8d0a2dddb9797f993fd0149b55aa5aeabafd07cc.zip | |
UI: improve category display
Diffstat (limited to 'chimere/static')
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 60 | ||||
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 3 |
2 files changed, 45 insertions, 18 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index ab27470..54fa7ab 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -61,7 +61,8 @@ div.warning, .errorlist{ div.warning, #content, .action li.selected, -#panel, #map-footer{ +#panel, #map-footer, +#utils-div{ border:1px solid #327e04; } @@ -234,19 +235,6 @@ ul#action-2 { padding:2px; } -#panel{ - padding:0; - position:absolute; - z-index:5; - top:50px; - right:18px; - width:300px; -} - -.simple #panel{ - top:5px; -} - #utils-div{ position:absolute; z-index:5; @@ -404,15 +392,53 @@ ul#share li{ margin:0; } -#panel #categories{ +#frm_categories{ + padding:0; margin:0; +} + +#panel{ + position:absolute; + z-index:5; + top:50px; + right:18px; + width:300px; + bottom:44px; + overflow:auto; + padding:0.5em; + padding-top:0; +} + +.simple #panel{ + top:5px; +} + + +#panel #categories{ padding:0; width:290px; + z-index:5; +} + +/*.panel-minified {*/ +#panel{ + bottom:None; +} + +#panel.panel-minified #categories > ul{ height:160px; overflow:auto; - z-index:5; + /*width:285px;*/ } +#panel.panel-minified{ + height:200px; + bottom:auto; + overflow:visible; +} + + + .simple #panel #categories{ display:None; } @@ -426,8 +452,6 @@ ul#share li{ #categories > ul{ margin:0; padding:0 10px; - overflow:auto; - height:160px; width:270px; } diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 565ad27..5c5fbec 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -361,6 +361,7 @@ See the file COPYING for details. if (settings.current_popup == feature.popup) { feature.popup.hide(); if (!settings.simple){ + $('#panel').removeClass('panel-minified'); $('#detail').hide(); } } else { @@ -436,6 +437,7 @@ See the file COPYING for details. } else { if (!settings.simple) { + $('#panel').addClass('panel-minified'); $('#detail').html(data).show(); } else { @@ -602,6 +604,7 @@ See the file COPYING for details. { settings.current_popup.hide(); if (!settings.simple){ + $('#panel').removeClass('panel-minified'); $('#detail').hide(); } } |
