From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Mar 2012 20:18:47 +0000 (+0100)
Subject: Rearrange layer switcher assets
X-Git-Tag: live~5611
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bd14832cb5f0ec77905cd0b82c2c65d3c8e047af?hp=8f4ed911e094d359ed630f034b76e02bc8d51705

Rearrange layer switcher assets
---

diff --git a/app/assets/javascripts/openlayers.js.erb b/app/assets/javascripts/openlayers.js.erb
index 9119a7b43..6d2f95047 100644
--- a/app/assets/javascripts/openlayers.js.erb
+++ b/app/assets/javascripts/openlayers.js.erb
@@ -1,6 +1,6 @@
 //= require OpenLayers
 //= require OpenStreetMap
-//= require simplelayerswitcher
+//= require SimpleLayerSwitcher
 
 OpenLayers.Util.imageURLs = {
     "404.png": "<%= asset_path 'img/404.png' %>",
diff --git a/app/assets/javascripts/simplelayerswitcher.js b/app/assets/openlayers/SimpleLayerSwitcher.js
similarity index 100%
rename from app/assets/javascripts/simplelayerswitcher.js
rename to app/assets/openlayers/SimpleLayerSwitcher.js
diff --git a/app/assets/openlayers/theme/default/SimpleLayerSwitcher.css.scss b/app/assets/openlayers/theme/default/SimpleLayerSwitcher.css.scss
new file mode 100644
index 000000000..fc9a33775
--- /dev/null
+++ b/app/assets/openlayers/theme/default/SimpleLayerSwitcher.css.scss
@@ -0,0 +1,44 @@
+.SimpleLayerSwitcher {
+  position: absolute;
+  top: 10px;
+  right: 10px;
+  background: #fff;
+  border: 1px solid #ccc;
+  min-width: 150px;
+  background: #fff;
+}
+
+.SimpleLayerSwitcher a.basey {
+  display: block;
+  text-decoration: none;
+  color: #838383;
+  padding: 2px 5px 2px 20px;
+}
+
+.SimpleLayerSwitcher a.basey-on {
+  color: #000;
+  background-color: #fff;
+  background-image: image-url("theme/default/img/carat.png");
+  background-repeat: no-repeat;
+  background-position: 7px 9px;
+}
+
+.SimpleLayerSwitcher a.basey-off {
+  display: none;
+}
+
+.SimpleLayerSwitcher:hover a {
+  border-top: 1px solid #eee;
+}
+
+.SimpleLayerSwitcher a:hover {
+  background-color: #f5f5f5;
+}
+
+.SimpleLayerSwitcher:hover a:first-child {
+  border-top: none;
+}
+
+.SimpleLayerSwitcher:hover a.basey-off {
+  display: block;
+}
diff --git a/app/assets/images/carat.png b/app/assets/openlayers/theme/default/img/carat.png
similarity index 100%
rename from app/assets/images/carat.png
rename to app/assets/openlayers/theme/default/img/carat.png
diff --git a/app/assets/openlayers/theme/default/style.css.scss b/app/assets/openlayers/theme/default/style.css.scss
index 3dbc047b0..c1ffb9fca 100644
--- a/app/assets/openlayers/theme/default/style.css.scss
+++ b/app/assets/openlayers/theme/default/style.css.scss
@@ -1,3 +1,7 @@
+/*
+ *= require theme/default/SimpleLayerSwitcher
+ */
+
 div.olMap {
     z-index: 0;
     padding: 0 !important;
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index ef2c46a8d..b6aaf7371 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1113,50 +1113,3 @@ abbr.geo {
     }
   }
 }
-
-/* Rules for the layer switcher */
-
-.SimpleLayerSwitcher {
-  position:absolute;
-  top:10px;
-  right:10px;
-  background:#fff;
-  border:1px solid #ccc;
-  min-width:150px;
-  background: #fff;
-}
-
-.SimpleLayerSwitcher a.basey {
-  display:block;
-  text-decoration:none;
-  color:#838383;
-  padding:2px 5px 2px 20px;
-}
-
-.SimpleLayerSwitcher a.basey-on {
-  color:#000;
-  background-color: #fff;
-  background-image: url('carat.png');
-  background-repeat: no-repeat;
-  background-position: 7px 9px;
-}
-
-.SimpleLayerSwitcher a.basey-off {
-  display:none;
-}
-
-.SimpleLayerSwitcher:hover a {
-  border-top:1px solid #eee;
-}
-
-.SimpleLayerSwitcher a:hover {
-  background-color:#f5f5f5;
-}
-
-.SimpleLayerSwitcher:hover a:first-child {
-  border-top:none;
-}
-
-.SimpleLayerSwitcher:hover a.basey-off {
-  display:block;
-}