diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-09 10:16:53 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-09 10:16:53 +0100 |
| commit | c867cc34794ce1908ca0172d682ffaaed42d2b6f (patch) | |
| tree | 442c94f22e3586eb1194c3a21e6e66b761212d0a | |
| parent | 645aae5525f0cfa77863e9c23a91aa92102ed34b (diff) | |
| parent | 0f53c75b7bceae05cb1f21b2fd106822253e82ed (diff) | |
| download | Chimère - projet Saclay-c867cc34794ce1908ca0172d682ffaaed42d2b6f.tar.bz2 Chimère - projet Saclay-c867cc34794ce1908ca0172d682ffaaed42d2b6f.zip | |
Merge branch 'saclay-v3.0' of git.iggdrasil.net:/srv/git/chimere_saclay into saclay-v3.0
Conflicts:
version.py
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 4 | ||||
| -rw-r--r-- | static/saclay/css/saclay.css | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 8626f23..26b15b4 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -389,7 +389,7 @@ msgstr " ?" #: templates/search/search.html:15 msgid "No results found." -msgstr "Pas de résultat traouvé." +msgstr "Pas de résultat trouvé." #: templates/search/search.html:23 msgid "Previous" @@ -432,7 +432,7 @@ msgstr "Pas de correspondance exacte." #~ "modifier votre recherche." #~ msgid "Show multimedia gallery" -#~ msgstr "Montrer la gallerie multimedia" +#~ msgstr "Montrer la gallerie multimédia" #~ msgid "Read more" #~ msgstr "En lire plus" diff --git a/static/saclay/css/saclay.css b/static/saclay/css/saclay.css index f8e829b..75fa5b6 100644 --- a/static/saclay/css/saclay.css +++ b/static/saclay/css/saclay.css @@ -79,6 +79,19 @@ ol-attribution ul { color: #644e38; } +#ul_categories .subcategories#maincategory_1 li .selected label, +#ul_categories .subcategories#maincategory_2 li .selected label, +#ul_categories .subcategories#maincategory_3 li .selected label, +#ul_categories .subcategories#maincategory_4 li .selected label, +#ul_categories .subcategories#maincategory_5 li .selected label, +#ul_categories .subcategories#maincategory_6 li .selected label, +#ul_categories .subcategories#maincategory_7 li .selected label, +#ul_categories .subcategories#maincategory_8 li .selected label, +#ul_categories .subcategories#maincategory_9 li .selected label, +#ul_categories .subcategories#maincategory_12 li .selected label { + color:#fff; +} + .main_category.toggle_plus > span#main_category_1 > label, .main_category.toggle_minus > span#main_category_1 > label, .main_category.toggle_plus > span#main_category_2 > label, |