diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2014-04-10 16:19:07 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2014-04-10 16:19:07 +0200 |
commit | 3a90d21b7d00696f9bdaa920e7aeff2bd6a84a9f (patch) | |
tree | 6ca70fc74d8f833d3b1e8f42c45ed8ca8bd5f7c5 | |
parent | 65c91bffe41ab67f535cbe37c949d5920f5a85a0 (diff) | |
parent | 3411538fdc6f78e467bfdb7b1b6a53f6d7637353 (diff) | |
download | Chimère - projet Saclay-3a90d21b7d00696f9bdaa920e7aeff2bd6a84a9f.tar.bz2 Chimère - projet Saclay-3a90d21b7d00696f9bdaa920e7aeff2bd6a84a9f.zip |
Merge branch 'master' into saclay
Conflicts:
static/saclay/css/styles.css
-rw-r--r-- | static/saclay/css/styles.css | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index a77a62f..5925998 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -610,7 +610,7 @@ a#ui-active-menuitem.ui-state-hover{ } .simple #main-map .olControlPanPanel .olControlPanNorthItemInactive { - right:-9px; + right:-50px; } .simple #main-map .olControlPanPanel .olControlPanEastItemInactive, @@ -620,15 +620,15 @@ a#ui-active-menuitem.ui-state-hover{ } .simple #main-map .olControlPanPanel .olControlPanEastItemInactive{ - right:-9px; + right:-50px; } .simple #main-map .olControlPanPanel .olControlPanWestItemInactive { - right:16px; + right:-25px; } .simple #main-map .olControlPanPanel .olControlPanSouthItemInactive { - right:-9px; + right:-50px; top:36px; height:30px; } |