Merge branch 'v2.2' into carteouverte

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

1 files changed, 18 insertions, 3 deletions

diff --git a/chimere_example_static/chimere/css/extra-styles.css b/chimere_example_static/chimere/css/extra-styles.css
index e3f9217..088dbe6 100644
--- a/chimere_example_static/chimere/css/extra-styles.css
+++ b/chimere_example_static/chimere/css/extra-styles.css
@@ -35,6 +35,10 @@ h2, h3 {
     background-color: transparent;
 }
 
+a:hover, a:focus {
+    color: #327E04;
+}
+
 .modal-backdrop.in {
     opacity: 0.1;
 }
@@ -74,8 +78,19 @@ input{
     width:inherit;
 }
 
-a:hover, a:focus {
-    color: #327E04;
+label.labelSpan.olButton{
+    margin:0;
+    margin-left:5px;
+}
+
+.baseLayersDiv input{
+    margin-left:5px;
+}
+
+#content .olControlLayerSwitcher .layersDiv {
+    border-radius: 0;
+    border:1px solid;
+    border-color: #E6E6E6;
 }
 
 .container{
@@ -103,7 +118,7 @@ a:hover, a:focus {
     padding: 0.2em 0.4em;
 }
 
-#panel, #detail-wrapper, .logos{
+#panel, #detail-wrapper, .logos, #content .olControlLayerSwitcher .layersDiv{
     background-color: #F8F8F8;
 }