From 5f8047991bc3549e1f90093b8b139145ead2e22f Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Thu, 1 Nov 2012 11:05:20 -0400 Subject: [PATCH] properly positioned leaflet controls and removed old open layers style rules. --- app/assets/stylesheets/common.css.scss | 25 ++++--------------------- app/assets/stylesheets/large.css | 6 ------ app/assets/stylesheets/small.css.scss | 12 +++--------- 3 files changed, 7 insertions(+), 36 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index ecdb40b44..2723678e4 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -415,7 +415,7 @@ body.site-export #tabnav a#exportanchor { top: 15px; } -/* Rules for OpenLayers maps */ +/* Rules for Leaflet maps */ #map { margin: 0px; @@ -423,13 +423,6 @@ body.site-export #tabnav a#exportanchor { padding: 0px; } -.olControlAttribution { - bottom: 15px !important; - left: 0px !important; - right: 0px !important; - text-align: center; -} - #permalink { z-index: 10000; position: absolute; @@ -445,11 +438,9 @@ body.site-export #tabnav a#exportanchor { padding: 5px; } -.site-index #map .SimpleLayerSwitcher, -.site-index #map .olControlSimplePanZoom, -.site-export #map .SimpleLayerSwitcher, -.site-export #map .olControlSimplePanZoom { - top: 40px !important; +.site-index .leaflet-top .leaflet-control, +.site-export .leaflet-top .leaflet-control { + margin-top: 40px !important; } /* Rules for edit menu */ @@ -1014,14 +1005,6 @@ p#contributorGuidance { /* Rules for the user map */ -.user_map .olControlSimplePanZoom { - display: none; -} - -.user_map .olControlZoom { - display: block; -} - /* Rules for user popups on maps */ .user_popup p { diff --git a/app/assets/stylesheets/large.css b/app/assets/stylesheets/large.css index ca58badc4..a24a55813 100644 --- a/app/assets/stylesheets/large.css +++ b/app/assets/stylesheets/large.css @@ -5,9 +5,3 @@ #small-greeting { display: none; } - -/* Rules for OpenLayers maps */ - -.olControlZoom { - display: none; -} diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss index 84813e9c1..19b4e6b89 100644 --- a/app/assets/stylesheets/small.css.scss +++ b/app/assets/stylesheets/small.css.scss @@ -92,15 +92,9 @@ h1 { border: 0; } -.olControlSimplePanZoom { - display: none; -} - -.site-index #map .olControlZoom, -.site-index #map .SimpleLayerSwitcher, -.site-export #map .olControlZoom, -.site-export #map .SimpleLayerSwitcher { - top: 8px !important; +.site-index .leaflet-top .leaflet-control, +.site-export .leaflet-top .leaflet-control { + margin-top: 10px !important; } /* Rules for the main content area */ -- 2.43.2