summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-10-01 16:20:52 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-10-01 16:20:52 +0200
commite1448d214af042878a799582183a7cb0b52d8bbf (patch)
treec473d58002803705e8d241c275f3563a01784b94
parentea4e994b8b9c8dec7f2851810533914595a773e5 (diff)
downloadChimère-e1448d214af042878a799582183a7cb0b52d8bbf.tar.bz2
Chimère-e1448d214af042878a799582183a7cb0b52d8bbf.zip
Simplify show-hide
-rw-r--r--chimere/static/chimere/css/styles.css48
-rw-r--r--chimere/templates/chimere/blocks/map.html1
-rw-r--r--chimere/templates/chimere/main_map.html2
3 files changed, 8 insertions, 43 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index a0e6a26..d6c7ca3 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -1462,18 +1462,14 @@ label.labelSpan.olButton{
}
#panel{
- max-height:none;
- left:0;
- bottom:0;
- border:0 transparent;
- border-left:1px solid #E7E7E7;
- padding:16px;
- padding-top:60px;
- width:400px;
- background-image:url('../img/logo.jpg');
- background-position:bottom center;
- background-repeat:no-repeat;
- z-index:12;
+ left: 0;
+ border: 0 transparent;
+ border-left: 1px solid #E7E7E7;
+ padding: 16px;
+ top: 52px;
+ width: 400px;
+ z-index: 12;
+ max-height: calc(100% - 54px);
}
#detail {
@@ -1733,28 +1729,6 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
}
}
-.show-hide-panel{
- position:absolute;
- left: 400px;
- top: 0;
- bottom: 0;
- background-color:#eee;
- width:20px;
- z-index:10;
- color:#666;
-}
-
-.show-hide-panel:hover{
- cursor:pointer;
-}
-
-.show-hide-panel span {
- position:absolute;
- left:2px;
- top:200px;
- color:#449506;
-}
-
#show-panel{
left:0;
display:none;
@@ -1772,12 +1746,6 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
}
}
-@media (min-height: 400px) {
- .show-hide-panel span {
- top:300px;
- }
-}
-
#content .olControlSimplePanZoom{
top: 58px !important;
left: auto !important;
diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html
index a2b6cba..04cf56f 100644
--- a/chimere/templates/chimere/blocks/map.html
+++ b/chimere/templates/chimere/blocks/map.html
@@ -38,7 +38,6 @@ $(function(){
{% if not display_category_menu %}
$(function() {
$('#panel').hide();
- $(".show-hide-panel").hide();
$("#categories-lnk").hide();
});{% endif %}
{{extra_js|safe}}
diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html
index 7909523..fd3f0b8 100644
--- a/chimere/templates/chimere/main_map.html
+++ b/chimere/templates/chimere/main_map.html
@@ -13,8 +13,6 @@
{% block message_edit %}{% endblock %}
{% block sidebar %}
{% display_news %}
- <div class='show-hide-panel' id='hide-panel'><span class='fa fa-arrow-circle-left'></span></div>
- <div class='show-hide-panel' id='show-panel'><span class='fa fa-arrow-circle-right'></span></div>
<div id='panel' class='navbar-default'>
<form id="frm_categories"><div id='categories'></div></form>
<div id='search-box' class='ui-widget ui-corner-all'></div>