Merge branch 'saclay' of ssh://kubo.niadomo.net/home/etienne/git/chimere_saclay into saclay

Conflicts:
	templates/chimere/blocks/map.html

1 files changed, 57 insertions, 0 deletions

diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 111eba2..cdc6977 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -193,6 +193,7 @@ div#panel{
 
 html, body{
     height:100%;
+    overflow:hidden;
 }
 
 .ui-button,
@@ -591,6 +592,62 @@ a#ui-active-menuitem.ui-state-hover{
     background-image:url("../images/menu/icon_center.png");
 }
 
+.simple #permalink{
+    display:none;
+}
+
+.simple #layer_selection{
+    top:10px;
+    right:10px;
+}
+
+.simple #main-map .olControlPanPanel .olControlPanNorthItemInactive,
+.simple #main-map .olControlPanPanel .olControlPanWestItemInactive,
+.simple #main-map .olControlPanPanel .olControlPanEastItemInactive,
+.simple #main-map .olControlPanPanel .olControlPanSouthItemInactive {
+    position: absolute;
+    height:20px;
+}
+
+.simple #main-map .olControlPanPanel .olControlPanNorthItemInactive {
+    right:-9px;
+}
+
+.simple #main-map .olControlPanPanel .olControlPanEastItemInactive,
+.simple #main-map .olControlPanPanel .olControlPanWestItemInactive {
+    height:20px;
+    top:18px;
+}
+
+.simple #main-map .olControlPanPanel .olControlPanEastItemInactive{
+    right:-9px;
+}
+
+.simple #main-map .olControlPanPanel .olControlPanWestItemInactive {
+    right:16px;
+}
+
+.simple #main-map .olControlPanPanel .olControlPanSouthItemInactive {
+    right:-9px;
+    top:36px;
+    height:30px;
+}
+
+.simple #sidebar{
+    top:0;
+}
+
+.simple #panel{
+    top:0;
+    overflow:auto;
+    overflow-x: hidden;
+    height:100%;
+}
+
+.simple #panel #categories {
+    display:block;
+}
+
 #content{
     border:none;
     padding:0;