Eliminate loading flash for welcome overlay

[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 d456e0685cfe481b3691ac3fff085d2b6226cd69..ebc5109c6335b4825ff9aa3811467590aba547b4 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -244,13 +244,13 @@ table {
   opacity: 0.6;
 }
 
-#header {
+header {
   height: $headerHeight;
   position: relative;
   z-index: 1001;
-  font-size: 13px;
+  font-size: 14px;
 
-  h1, .nav, .nav > ul, .nav > ul > li, .user-menu {
+  h1, nav, nav > ul, nav > ul > li, .dropdown {
     display: inline-block;
   }
 
@@ -259,7 +259,7 @@ table {
     padding: $lineheight/2;
   }
 
-  h1, .nav.primary {
+  h1, nav.primary {
     float: left;
   }
 
@@ -270,7 +270,7 @@ table {
   img.logo {
     width: 30px;
     height: 30px;
-    margin-top: -4px;
+    margin-top: -2px;
     vertical-align: middle;
   }
 
@@ -284,7 +284,7 @@ table {
   }
 }
 
-.nav.primary {
+nav.primary {
   > ul {
     $border: 1px solid $green;
 
@@ -347,18 +347,17 @@ table {
   }
 }
 
-.nav.secondary {
+nav.secondary {
   position: absolute;
   right: 0;
 
-  > ul,
-  > #compact-secondary-nav {
+  > ul {
     vertical-align: middle;
     a, .dropdown-toggle {
       display: inline-block;
       text-decoration: none;
       color: $darkgrey;
-      padding: 5px;
+      padding: 3px 5px 5px 5px;
 
       &:hover { color: darken($darkgrey, 25%); }
     }
@@ -370,8 +369,6 @@ table {
 
   .user-menu {
     $border: 1px solid $grey;
-    font-weight: bold;
-    font-weight: 500;
     border: $border;
     border-radius: $border-radius;
     margin-left: 10px;
@@ -398,7 +395,8 @@ table {
     &.logged-in > a {
       padding: 0;
       > .user-button {
-        padding: 5px 10px 5px 6px;
+        line-height: 1.8;
+        padding: 5px 10px 3px 6px;
         display: inline-block;
         color: $darkgrey;
       }
@@ -415,7 +413,7 @@ table {
     border: 0;
     vertical-align: top;
     margin-top: 0px;
-    margin: 3px 0 0 3px;
+    margin: 4px 0 0 4px;
     border-radius: 2px;
   }
 
@@ -456,7 +454,7 @@ table {
     display: inline-block;
   }
   .compact-hide {
-    display: none !important;
+    display: none;
   }
 }
 
@@ -651,12 +649,22 @@ table {
     }
   }
 
+  .welcome {
+    display: none;
+  }
+
   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
     border-bottom-right-radius: 5px;
     overflow: hidden;
+    .welcome {
+      display: block;
+    }
+    #sidebar_content {
+      display: none;
+    }
   }
 
   .welcome {
@@ -894,14 +902,14 @@ table {
   .load_more {
     text-align: center;
     margin: $lineheight auto;
-    width: $lineheight;
+    width: 40px;
     display: block;
   }
 }
 
 /* Rules for the search box */
 
-#header .search_form {
+header .search_form {
   display: none;
 }
 
@@ -998,7 +1006,7 @@ table {
 
 #sidebar .changesets {
   li {
-    padding: $lineheight;
+    padding: 15px 20px;
     border-bottom: 1px solid #ddd;
     cursor: pointer;
 
@@ -1007,7 +1015,7 @@ table {
   }
 
   h4 {
-    margin-top: 0;
+    margin: 0;
     a {
       color: #000;
     }
@@ -1129,10 +1137,28 @@ table {
     margin-bottom: $lineheight/2;
     input[type="text"] {
       width: 80px;
+      text-align: center;
       margin-bottom: 5px;
     }
   }
 
+  .export_boxy {
+    background: #eee;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+
+    #maxlat { margin-top: -1px; }
+    #minlon {
+      float: left;
+      margin-left: -1px;
+    }
+    #maxlon {
+      float: right;
+      margin-right: -1px;
+    }
+    #minlat { margin-bottom: 0; }
+  }
+
   .export_bound {
     margin: $lineheight/4;
   }
@@ -1380,6 +1406,10 @@ table {
 }
 
 .user-view {
+  // Silly exception; remove when user page is redesigned.
+  .content-inner {
+    max-width: none;
+  }
   p#no_home_location {
     margin: $lineheight;
   }