Merge branch 'master' into notes

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

diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss
index 07b5d7b1075f534e2bc46f1b2ab865990b6d3632..ba9e59d968a70fc2f5bcd1699def1cf2836b2672 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -18,23 +18,26 @@ h1 {
 
 /* Rules for tabbed navigation bar */
 
-#tabnav
-{
+#top-bar {
+  left: 0;
+  margin: 0px;
+  height: 39px;
+  padding: 0;
+}
+
+#tabnav {
   height: 14px;
   margin: 0px;
-  padding-left: 3px;
   padding-top: 5px;
-  margin-top: 18px;
-  background: image-url('tab_bottom.gif') repeat-x bottom;
+  margin-top: 20px;
   font-size: 10px;
   line-height: 10px;
 }
 
-#tabnav a, #tabnav a:link, #tabnav a:visited 
-{
+#tabnav a, #tabnav a:link, #tabnav a:visited {
   font-size: 10px;
   line-height: 10px;
-  padding: 1px 5px;
+  padding: 2px 5px;
   margin-right: 1px;
 }
 
@@ -46,7 +49,8 @@ h1 {
   height: 16px;
   display: block;
   position: absolute;
-  top: 0;
+  left: 5px;
+  top: 5px;
   padding: 2px;
   width: 110px; /* TODO: find better fix for overlap */
   background-color: #fff;
@@ -61,15 +65,15 @@ h1 {
   position: absolute;
   left: 18px;
   font-size: 12px;
-  margin: 2px;
+  margin: 0;
 }
 
 /* Rules for greeting bar in the top right corner */
 
 #greeting {
   position: absolute;
-  top: 0px;
-  right: 0px;
+  right: 5px;
+  top: 5px;
   height: 14px;
   font-size: 12px;
   line-height: 12px;
@@ -91,26 +95,30 @@ h1 {
   border: 0;
 }
 
-.olControlPanZoomBar {
+.olControlSimplePanZoom {
   display: none;
 }
 
+.site-index #map .olControlZoom,
+.site-index #map .SimpleLayerSwitcher,
+.site-export #map .olControlZoom,
+.site-export #map .SimpleLayerSwitcher {
+  top: 8px !important;
+}
+
 /* Rules for the main content area */
 
 #content {
-  left: 10px;
-  right: 10px;
-  top: 47px;
   margin-left: 0px;
   margin-right: 0px;
+  border-left: 0px;
+  border-right: 0px;
 }
 
-#content.site_index {
-  left: 0px;
-  right: 0px;
-  top: 38px;
-  bottom: 0px;
-  padding-bottom: 0px;
+.site-export #content,
+.site-edit #content,
+.site-index #content {
+  margin-top: 40px;
 }
 
 /* Rules for search sidebar when shown */