Combine and refine third and sixth section

[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 84813e9c1a2715cacdf4a20e0dac64ec082220ae..5e21ce1861eedfd6c60edd81fa20d2e3dd735e20 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -3,11 +3,39 @@
 /* Default rules for the body of every page */
 
 body {
-  font-size: 12px;
+  font-size: 10px;
 }
 
 h1 {
-  font-size: 14px;
+  font-size: 12px;
+}
+
+h2, h3, h4 {
+  font-size: 12px;
+}
+
+.wrapper {
+  margin: 0;
+}
+
+.site-edit #content,
+.site-index #content,
+.site-export #content {
+  left: 0;
+}
+
+.site-edit #top-bar,
+.site-index #top-bar,
+.site-export #top-bar {
+  position: relative;
+}
+
+.site-edit #content, .site-index #content, .site-export #content {
+  position: absolute;
+}
+
+.column-1 {
+  width: 100%;
 }
 
 /* Rules for the whole left sidebar, including the logo */
@@ -19,16 +47,17 @@ h1 {
 /* Rules for tabbed navigation bar */
 
 #top-bar {
+  left: 0;
   margin: 0px;
-  height: 39px;
-  padding: 0;
+  height: 24px;
+  position: static;
 }
 
 #tabnav {
-  height: 14px;
+  height: 19px;
   margin: 0px;
   padding-top: 5px;
-  margin-top: 20px;
+  margin-top: 26px;
   font-size: 10px;
   line-height: 10px;
 }
@@ -36,33 +65,20 @@ h1 {
 #tabnav a, #tabnav a:link, #tabnav a:visited {
   font-size: 10px;
   line-height: 10px;
-  padding: 2px 5px;
+  padding: 5px;
   margin-right: 1px;
 }
 
+.menuicon { line-height: 10px;}
+
 /* Rules for the site name - shown when left sidebar is hidden */
 
 #small-title {
-  font-size: 12px;
-  line-height: 14px;
-  height: 16px;
+  font-size: 10px;
   display: block;
   position: absolute;
+  left: 5px;
   top: 5px;
-  padding: 2px;
-  width: 110px; /* TODO: find better fix for overlap */
-  background-color: #fff;
-  z-index: 100;
-}
-
-#small-title img {
-  position: absolute;
-}
-
-#small-title h1 {
-  position: absolute;
-  left: 18px;
-  font-size: 12px;
   margin: 0;
 }
 
@@ -70,37 +86,41 @@ h1 {
 
 #greeting {
   position: absolute;
-  top: 5px;
-  height: 14px;
-  font-size: 12px;
-  line-height: 12px;
-  white-space: nowrap;
+  right: 0;
+  top: 0;
   background: none;
 }
 
-#full-greeting {
-  display: none;
+#browse_map ul.secondary-actions {
+  float: right;
+  font-size: 10px;
 }
 
-#small-greeting {
-  display: inline;
+#map {
+  border: 0;
 }
 
-/* Rules for OpenLayers maps */
+.content_map {
+  width: 100%;
+  border: none;
+  float: none;
+  height: 200px;
+  max-height: none;
+  min-height: auto;
+}
 
-#map {
-  border: 0;
+.content_map #small_map {
+  height: 300px;
+  border: 1px solid #ccc;
 }
 
-.olControlSimplePanZoom {
+.leaflet-control-pan, .leaflet-control-zoomslider {
   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,
+.site-export .leaflet-top {
+  top: 10px !important;
 }
 
 /* Rules for the main content area */
@@ -115,25 +135,43 @@ h1 {
 .site-export #content,
 .site-edit #content,
 .site-index #content {
-  margin-top: 40px;
+  margin-top: 21px;
 }
 
 /* Rules for search sidebar when shown */
 
 #sidebar {
   border: 0px;
-  border-right: 1px solid #ccccdd;
   margin: 0px;
-}
-
-.sidebar_title, #sidebar_content {
-  font-size: 10px !important;
+  width: 50% !important;
+  border-right: 1px solid #ccccdd;
 }
 
 p.search_results_entry {
   padding: 2px 0px;
 }
 
+/* Rules for the map UI */
+
+.layers-ui {
+  .leaflet-container {
+    display: none;
+  }
+
+  li {
+    border-radius: 0;
+    margin-bottom: 0;
+
+    &:first-child {
+      border-radius: 4px 4px 0 0;
+    }
+
+    &:last-child {
+      border-radius: 0 0 4px 4px;
+    }
+  }
+}
+
 /* Rules for the signup form */
 
 #signupForm input[type="text"], #signupForm input[type="password"] {
@@ -178,19 +216,23 @@ p.search_results_entry {
 }
 
 #login_openid_buttons td {
-  padding-left: 2px;
-  padding-right: 2px;
-  padding-top: 2px;
-  padding-bottom: 2px;
+  padding: 2px;
 }
 
-/* Rules for the profile page */
+/* Rules for the user view */
 
 .user_map {
   width: 100% !important;
   height: 300px !important;
 }
 
+#userinformation .deemphasize {
+  position: relative;
+  right: auto; left: auto;
+  margin-top: 10px;
+  top: auto;
+}
+
 /* Rules for the user settings page */
 
 #user_new_email {
@@ -207,34 +249,21 @@ p.search_results_entry {
 
 /* Rules for the browse pages */
 
-#browse_navigation {
-  width: 100% !important;
-  margin-top: 0 !important;
+.browse-section.common div{
+  clear: both;
 }
 
-#small_map, #browse_map {
-  width: 100% !important;
-}
-
-#changeset_list tr {
-  display: block;
-  clear: left;
+#changeset_list_map {
+  position: relative;
   width: 100%;
-}
-
-#changeset_list th {
-  display: none;
-}
-
-#changeset_list td {
-  display: block;
-  float: left;
-  padding-right: 10px;
-}
-
-#changeset_list td.comment, #changeset_list td.area {
-  width: 96%;
-  clear: left;
+  right: 0;
+  left: 0;
+  top: 0px;
+  margin-bottom: 20px;
+  float: none;
+  height: 300px !important;
+  max-height: auto;
+  min-height: auto;
 }
 
 /* Rules for the diary entries pages */