summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-09-27 16:12:07 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-09-27 16:14:52 +0200
commit13f37c70772f9dd6035d5656fa7a862c107aa217 (patch)
tree51b2f33eb10cfce60a9e2fd0e87bd41f1bc3d7ea
parent05c0b37789a08faf212f90dbd55e50cbca47e8e9 (diff)
downloadChimère-13f37c70772f9dd6035d5656fa7a862c107aa217.tar.bz2
Chimère-13f37c70772f9dd6035d5656fa7a862c107aa217.zip
Always display help icon on category
-rw-r--r--chimere/static/chimere/css/styles.css13
-rw-r--r--chimere/templates/chimere/blocks/categories.html23
2 files changed, 9 insertions, 27 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index c587ea8..23ddd82 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -2340,7 +2340,7 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
display: none;
}
-.subcategory-icon, .description_icon{
+.subcategory-icon{
position: absolute;
padding: 3px;
width: 30px;
@@ -2348,11 +2348,8 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
}
.description_icon{
- right: 34px;
- background-color: white;
- border: 1px solid #999;
- border-radius: 5px;
- display: none;
+ font-size: 1em;
+ padding: 0 0.2em;
}
.subcategory-icon{
@@ -4261,10 +4258,6 @@ li.main_category li.subcategory > span > label{
#categories label{
width: 100%;
}
- .description_icon{
- display: block;
- font-size: 1em;
- }
#back-categories{
position: static;
text-align: center;
diff --git a/chimere/templates/chimere/blocks/categories.html b/chimere/templates/chimere/blocks/categories.html
index cf13404..9234b31 100644
--- a/chimere/templates/chimere/blocks/categories.html
+++ b/chimere/templates/chimere/blocks/categories.html
@@ -31,14 +31,14 @@
<img src="{{sub_category.icon.image.url}}">
{% endif %}
</div>
- {% if sub_category.description %}
- <a href="#"><i class="description_icon fa fa-info-circle"
- aria-hidden="true"
- onclick="$('#map').chimere('subcategory_detail', {{sub_category.id}});"></i>
- </a>
- {% endif %}
<label for='category_{{sub_category.id}}'>
{% trans sub_category.name %}
+ {% if sub_category.description %}
+ <a href="#"><i class="description_icon fa fa-info-circle"
+ aria-hidden="true"
+ onclick="$('#map').chimere('subcategory_detail', {{sub_category.id}});"></i>
+ </a>
+ {% endif %}
</label>
<input type='checkbox' name='category_{{sub_category.id}}' id='category_{{sub_category.id}}'{% if sub_category.selected %} checked='checked'{% endif %}/>
</span>
@@ -58,17 +58,6 @@ $(function() {
}
chimere_init_options['checked_categories'] = null;
}
-
- $(".subcategory").mouseenter(function() {
- if ($("#switch-menu").not(':visible').length){
- $(this).find(".description_icon").show();
- }
- }).mouseleave(function() {
- if ($("#switch-menu").not(':visible').length){
- $(this).find(".description_icon").hide();
- }
- });
-
});
// -->
</script>