Merge branch 'master' into carteouverte

Conflicts:
	chimere_example_static/chimere/css/extra-styles.css

3 files changed, 18 insertions, 4 deletions

diff --git a/chimere_example_static/chimere/css/extra-styles.css b/chimere_example_static/chimere/css/extra-styles.css
index e29c6e8..323ed56 100644
--- a/chimere_example_static/chimere/css/extra-styles.css
+++ b/chimere_example_static/chimere/css/extra-styles.css
@@ -3,8 +3,7 @@
     margin-top:40px;
 }
 
-ul.share a span.fa, ul.share,
-.nav-pills > li > a > .fa,
+ul.share a span.fa, ul.share, .nav-pills > li > a > .fa,
 a, a:link, a:visited, legend, #footer .map-footer a, #footer .map-footer a:link,
 #footer .map-footer a:visited, .detail_footer a, caption,
 #categories li#display_submited, h4, .simple .cloud h2 {
@@ -15,6 +14,7 @@ a, a:link, a:visited, legend, #footer .map-footer a, #footer .map-footer a:link,
     color:#777;
 }
 
+.pager li a,
 .detail_amendment a, .detail_amendment a:visited,
 .nav-pills > li.active > a > .fa{
     color:#fff;
@@ -24,12 +24,21 @@ a, a:link, a:visited, legend, #footer .map-footer a, #footer .map-footer a:link,
     background-color: #fff;
 }
 
+.pager li a,
 .detail_amendment,
 .nav-pills > li.active > a, .nav-pills > li.active > a:hover,
 .nav-pills > li.active > a:focus {
     background-color: #99CA3C;
 }
 
+.pager li a:hover{
+    background-color: #327E04;
+}
+
+.pager li a:hover{
+    border-color: #327E04;
+}
+
 h2, h3 {
     color: #449506;
     background-color: transparent;
@@ -467,14 +476,19 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
 }
 
 #content .olControlSimplePanZoom{
-    top: 18px !important;
+    top: 58px !important;
     left: auto !important;
     right:50px !important;
 }
 
+#content .olControlLayerSwitcher .maximizeDiv{
+    left: -60px !important;
+}
+
 #content #main-map .olControlLayerSwitcher {
     left: auto !important;
     right:50px !important;
+    top:10px !important;
 }
 
 /* logos */
diff --git a/chimere_example_static/chimere/img/layer-switcher-maximize.png b/chimere_example_static/chimere/img/layer-switcher-maximize.png
new file mode 100644
index 0000000..326f243
--- /dev/null
+++ b/chimere_example_static/chimere/img/layer-switcher-maximize.png
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 4b98532..110a0fa 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -84,7 +84,7 @@ msgstr "Galerie"
 
 #: templates/chimere/blocks/actions.html:31
 msgid "News"
-msgstr "Nouvelles"
+msgstr "Actualités"
 
 #: templates/chimere/blocks/actions.html:33
 msgid "Simple map"