summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-04-19 22:55:34 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-04-19 22:55:34 +0200
commit7d921825d32c41c05b8814cde99e1c5ab3460c49 (patch)
tree11028aeac3106075cd534193d2dce838606d03bc
parent33bf3c5cb7ce7314363be0b8ffe8655544596f71 (diff)
parent959a7f65dea1b3251e52ada13dc33ddc5b32a61b (diff)
downloadChimère - projet de référence-7d921825d32c41c05b8814cde99e1c5ab3460c49.tar.bz2
Chimère - projet de référence-7d921825d32c41c05b8814cde99e1c5ab3460c49.zip
Merge branch 'v2.2' into carteouverte
-rw-r--r--chimere_example_static/chimere/css/extra-styles.css10
-rw-r--r--settings.py2
2 files changed, 12 insertions, 0 deletions
diff --git a/chimere_example_static/chimere/css/extra-styles.css b/chimere_example_static/chimere/css/extra-styles.css
index 9d67c9c..4a5f233 100644
--- a/chimere_example_static/chimere/css/extra-styles.css
+++ b/chimere_example_static/chimere/css/extra-styles.css
@@ -249,6 +249,12 @@ li.main_category > span.category_name:hover{
width:30px;
}
+@media (min-height: 500px) {
+ #category-directory{
+ width:50%;
+ }
+}
+
#search-nav{
position:absolute;
bottom:0;
@@ -363,6 +369,10 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
content:"\f040";
}
+.fa-chimere-categories:before{
+ content:"\f03a";
+}
+
.fa-chimere-rss:before{
content:"\f09e";
}
diff --git a/settings.py b/settings.py
index ffe170e..6df6f4e 100644
--- a/settings.py
+++ b/settings.py
@@ -56,6 +56,8 @@ CHIMERE_DISPLAY_AREAS = True
CHIMERE_DAYS_BEFORE_EVENT = 30
# allow feeds
CHIMERE_FEEDS = True
+# display a directory of items
+CHIMERE_DIRECTORY = True
CHIMERE_ICON_WIDTH = 21
CHIMERE_ICON_HEIGHT = 25