Use the asset pipeline to load the sprite

[rails.git] / app / assets / stylesheets / common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 5762d725178f6633a42127fdb57224d179fddbcd..ecdb40b44854783e7d69edda16d9695904fd335c 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -48,7 +48,8 @@ h2 {
 
 #left {
   position: absolute;
 
 #left {
   position: absolute;

-  top: 0px;
+  top: 30px;
+  bottom: 0;

   width: 185px;
   font-size: 11px;
   line-height: 12px;
   width: 185px;
   font-size: 11px;
   line-height: 12px;


@@ -62,7 +63,7 @@ h2 {
   min-width: 170px;
   padding: 5px;
   text-align: center;
   min-width: 170px;
   padding: 5px;
   text-align: center;

-  margin: 25px auto 5px auto;
+  margin: auto;

 }
 
 #logo img {
 }
 
 #logo img {


@@ -231,7 +232,6 @@ h2 {
 
 #search_field input[type="text"] {
   width: 165px;
 
 #search_field input[type="text"] {
   width: 165px;

-  padding: 2px 0 2px 5px;

   font-size: 14px;
   line-height: 15px;
   height: 25px;
   font-size: 14px;
   line-height: 15px;
   height: 25px;


@@ -250,21 +250,20 @@ h2 {
 #search_field input[type="submit"] {
   width: 15px;
   height: 15px;
 #search_field input[type="submit"] {
   width: 15px;
   height: 15px;

-  border:0;
-  text-indent:-1000px;
+  border: 0px;
+  text-indent: -1000px;

   overflow: hidden;
   text-transform: capitalize;
   padding-left: 0px;
   padding-right: 0px;
   overflow: hidden;
   text-transform: capitalize;
   padding-left: 0px;
   padding-right: 0px;

-  background: url(sprite.png);
-  position:absolute;
-  right:4px;
-  top:5px;
-  cursor:pointer;
+  background: image-url("sprite.png");
+  position: absolute;
+  top: 5px;
+  cursor: pointer;

 }
 
 .search_help {
 }
 
 .search_help {

-  margin:5px 0 0 0;
+  margin: 5px 0 0 0;

 }
 
 .deemphasize {
 }
 
 .deemphasize {


@@ -309,9 +308,8 @@ h2 {
   border: 0px;
   padding-left: 0px;
   padding-right: 0px;
   border: 0px;
   padding-left: 0px;
   padding-right: 0px;

-  background: url(sprite.png) 0 -30px no-repeat;
+  background: image-url("sprite.png") 0 -30px no-repeat;

   position: absolute;
   position: absolute;

-  left: 17px;

   top: 8px;
 }
 
   top: 8px;
 }
 


@@ -325,8 +323,11 @@ h2 {
 /* Rules for tabbed navigation bar */
 
 #top-bar {
 /* Rules for tabbed navigation bar */
 
 #top-bar {

-  border-bottom: 1px solid #ccc;
+  position: absolute;
+  top: 0;

   height: 29px;
   height: 29px;

+  border-bottom: 1px solid #ccc;
+  background: white;

 }
 
 #tabnav {
 }
 
 #tabnav {


@@ -444,12 +445,11 @@ body.site-export #tabnav a#exportanchor {
   padding: 5px;
 }
 
   padding: 5px;
 }
 

-div.olControlZoom a {
-  margin: 0 !important;
-}
-
-div.olControlZoom a.olControlZoomIn {
-    border-bottom: 0;
+.site-index #map .SimpleLayerSwitcher,
+.site-index #map .olControlSimplePanZoom,
+.site-export #map .SimpleLayerSwitcher,
+.site-export #map .olControlSimplePanZoom {
+  top: 40px !important;

 }
 
 /* Rules for edit menu */
 }
 
 /* Rules for edit menu */


@@ -500,7 +500,7 @@ div.olControlZoom a.olControlZoomIn {
 #sidebar {
   display: none;
   position: absolute;
 #sidebar {
   display: none;
   position: absolute;

-  margin: 0px;
+  margin: 30px 0px 0px 0px;

   padding: 0px;
   width: 30%;
   top: 0px;
   padding: 0px;
   width: 30%;
   top: 0px;


@@ -524,7 +524,7 @@ div.olControlZoom a.olControlZoomIn {
   height: 29px;
   font-size: 14px;
   line-height: 15px;
   height: 29px;
   font-size: 14px;
   line-height: 15px;

-  background: #bbb;
+  background: #ccc;

 }
 
 /* Rules for the map key which appears in the popout sidebar */
 }
 
 /* Rules for the map key which appears in the popout sidebar */


@@ -636,19 +636,26 @@ div.olControlZoom a.olControlZoomIn {
 /* Rules for the main content area */
 
 #content {
 /* Rules for the main content area */
 
 #content {

-  padding: 10px;
-  margin: 0px;
-  position: absolute;
-  bottom: 0px;
+  padding: 20px;
+  margin: 30px 0px 0px 0px;

 }
 
 }
 

-.site-index #content,

 .site-edit #content,
 .site-edit #content,

+.site-index #content,

 .site-export #content {
 .site-export #content {

-  border: 0px;
+  position: fixed;
+  margin-top: 0px;
+  left: 0px;
+  right: 0px;
+  top: 0px;
+  bottom: 0px;

   padding: 0px;
 }
 
   padding: 0px;
 }
 

+.site-edit #content {
+  top: 30px;
+}
+

 #slim_container {
   width: 100%;
 }
 #slim_container {
   width: 100%;
 }