Added hover state to close button

[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 357372a9be76db4622c90e865e7b312754f1893d..82b78f664b7eae3e590e175213364a951a696345 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -7,12 +7,13 @@ $blue: #7092FF;
 $lightblue: #B8C5F0;
 $green: #7ebc6f;
 $grey: #CCC;
+$red: red;
 $lightgrey: #EEE;
 $darkgrey: #AAA;
 $hovercolor: 20%;
 $headerHeight: 54px;
-$sidebarWidth: 350px;
-$keyline: 1px solid $grey;
+$sidebarWidth: 300px;
+$keyline: 1px solid $lightgrey;
 $border-radius: 3px;
 
 /* Styles common to large and small screens */
@@ -51,6 +52,8 @@ abbr, acronym {
   cursor: help;
 }
 
+strong { font-weight: 500; }
+
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 
 .clearfix:before,
@@ -123,6 +126,8 @@ h1, h2, h3 {
   line-height: 1.2;
 }
 
+h4, h5 { font-weight: 500; }
+
 h1 {
   font-size: 18px;
 }
@@ -150,6 +155,8 @@ small, aside {
   margin-right: $lineheight/4;
 }
 
+.red { color: $red; }
+
 /* Rules for icons */
 
 .icon {
@@ -174,6 +181,7 @@ small, aside {
 .icon.clipboard   { background-position: -160px 0; }
 .icon.link        { background-position: -180px 0; }
 .icon.close       { background-position: -200px 0; }
+.icon.close:hover { background-position: -200px -20px; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
 .icon.gear        { background-position: -260px 0; }
@@ -592,19 +600,21 @@ nav.secondary {
   #sidebar {
     float: left;
     width: $sidebarWidth;
-    border-right: $keyline;
 
     h2, h3, h4 {
-      padding: $lineheight;
+      padding: $lineheight $lineheight $lineheight/2;
     }
 
     h4 {
       font-weight: normal;
+      color: #666;
+      font-size: 12px;
     }
 
     .icon.close {
       position: absolute;
       right: $lineheight;
+      cursor: pointer;
     }
 
     .footer {
@@ -620,16 +630,28 @@ nav.secondary {
         color: #666;
       }
     }
+
+    p.large-text {
+      font-size: 1.7em;
+      line-height: 1.4em;
+      font-weight: 300;
+    }
   }
 
   #sidebar.minimized {
     position: absolute;
     z-index: 1000;
     height: auto;
+    border-right: none;
 
     #sidebar_content {
       display: none;
     }
+
+    #search_form {
+      background: none;
+      width: 78%;
+    }
   }
 
   #map {
@@ -648,7 +670,7 @@ nav.secondary {
 
     .section {
       border-bottom: 1px solid #DDD;
-      padding: 15px;
+      padding: 10px 20px;
     }
 
     a.close-button {
@@ -670,29 +692,56 @@ nav.secondary {
 }
 
 .layers-ui {
-  li {
-    border-radius: 4px;
-    overflow: hidden;
-    margin-bottom: 10px;
-  }
-
-  label {
-    display: block;
-    padding: 5px 5px 5px 7px;
-    background-color: #eee;
-    cursor: pointer;
-  }
-
-  li.active label {
-    background-color: #ccc;
-  }
-
   .base-layers {
     .leaflet-container {
       width: 100%;
       height: 50px;
       cursor: pointer;
     }
+
+    li  {
+      overflow: hidden;
+      border-radius: 3px;
+      border: 2px solid #fff;
+      margin-bottom: 8px;
+      position: relative;
+      transition: border-color 0.08s ease-in;
+      
+      label {
+        position: absolute;
+        top: 10px;
+        left: 8px;
+        padding: 2px 6px;
+        border-radius: 3px;
+        cursor: pointer;
+        font-weight: 500;
+        font-size: 16px;
+        text-stroke: 2px #fff;
+        background: rgba(255,255,255,.8);
+        text-shadow:
+         -2px -2px 1px #fff,  
+          2px -2px 1px #fff,
+          -2px 2px 1px #fff,
+           2px 2px 1px #fff;
+        input[type="radio"] {
+          vertical-align: middle;
+          margin-bottom: 4px;
+        }
+      }
+
+      &.active { border-color: darken($green, 10%); }
+      &:hover {
+        border-color: $grey;
+        &.active { border-color: darken($green, 20%); }
+      }
+    }
+  }
+
+  .overlay-layers {
+    p {
+      font-size: 13px;
+      margin-bottom: 8px;
+    }
   }
 }
 
@@ -790,22 +839,18 @@ nav.secondary {
 .sidebar_heading {
   position: relative;
   padding: $lineheight/2 $lineheight;
-  background: $offwhite;
-  border-bottom: 1px solid #ccc;
-}
-
-.sidebar_close {
-  position: absolute;
-  height: $lineheight;
-  top: 0px;
-  bottom: 0;
-  right: $lineheight;
-  margin: auto;
+  // background: $offwhite;
+  // border-bottom: 1px solid #ccc;
+  > .close { 
+    float: right;
+    margin-top: 2px;
+    cursor: pointer; 
+  }
 }
 
 #sidebar_content {
   position: absolute;
-  top: 72px;
+  top: 50px;
   bottom: 0;
   width: 100%;
   overflow-y: auto;
@@ -823,9 +868,8 @@ nav.secondary {
 
 #search_form {
   position: relative;
-  padding: $lineheight;
+  padding: $lineheight/2 $lineheight;
   background-color: $lightgrey;
-  border-bottom: $keyline;
 
   #query_wrapper {
     position: relative;
@@ -868,19 +912,17 @@ nav.secondary {
 
 a.donate {
   display: block;
-  width: 163px;
-  padding: $lineheight/4;
-  border: 1px solid #AED1A0;
-  background: #cbeea7;
+  padding: $lineheight/4 $lineheight;
+  border: 1px solid $green;
   font-size: $typeheight;
   line-height: 1.4;
   text-align: center;
   border-radius: 2px;
   color: #222;
-  margin: $lineheight/2 auto;
+  margin: $lineheight/2 $lineheight;
 
   &:hover {
-    background: #9ed485;
+    background: $green;
     text-decoration: none;
   }
 }
@@ -925,7 +967,8 @@ a.donate {
 
 .search_results_entry {
   ul li {
-    border-bottom: 1px solid #ccc;
+    border-bottom: $keyline;
+    &:first-child { border-top: $keyline; }
   }
 
   .search_details {
@@ -962,8 +1005,12 @@ a.donate {
   }
 }
 
-.browse_details {
-  position: relative;
+/* Rules for entity history */
+#sidebar_content {
+  .browse_details {
+    position: relative;
+    border-bottom: $keyline;
+  }
 }
 
 .browse_status {
@@ -977,10 +1024,8 @@ a.donate {
     padding: $lineheight;
     border-bottom: $keyline;
     cursor: pointer;
-  }
 
-  li.selected {
-    background: #FCFEA4;
+    &.selected { background: lighten($green, 35%); }
   }
 }
 
@@ -988,7 +1033,15 @@ a.donate {
 
 #sidebar_content {
   .browse-section {
-    padding: 20px;
+    padding: 10px 20px;
+
+    h4 {
+      padding: 0;
+    }
+  }
+
+  .paginate ul, .note-comments ul {
+    padding-left: 20px;
   }
 
   .browse-field {
@@ -1051,7 +1104,7 @@ a.donate {
 #sidebar_content {
   .browse-section.header {
     padding: 20px;
-    border-bottom: 1px solid #CCC;
+    border-bottom: 1px solid #ccc;
 
     h2 {
       padding: 0 0 5px 0;
@@ -1078,6 +1131,25 @@ a.donate {
   margin: $lineheight/4;
 }
 
+#export_osm {
+  span.small-title { 
+    font-weight: 500;
+    display: block;
+    font-size: 14px;
+    padding-bottom: 5px; 
+  }
+
+  dl {
+    padding-left: 30px;
+    font-size: 13px;
+    color: #666;
+    dd {
+      margin-left: 0;
+      margin-bottom: 10px;
+    }
+  }
+}
+
 /* Rules for edit pages */
 
 .site-edit {
@@ -1097,7 +1169,8 @@ a.donate {
 
 .content-heading {
   background: $lightgrey;
-  // border-bottom: $keyline;
+  
+  h1 { font-size: 22px; }
 }
 
 .content-body {
@@ -1784,7 +1857,7 @@ abbr.geo {
 
 .rsssmall {
   position: relative;
-  top: 5px;
+  top: 3px;
 }
 
 /* General styles for action lists / subnavs / pager navs */
@@ -1802,8 +1875,8 @@ ul.secondary-actions {
     float: left;
     list-style: none;
     border-left: 1px solid #ccc;
-    padding-left: $lineheight/4;
-    margin-right: $lineheight/4;
+    padding-left: $lineheight/2;
+    margin-right: $lineheight/2;
     &:first-child {
       border-left: 0;
       padding-left: 0;
@@ -2388,13 +2461,14 @@ a.button {
 
   .caption {
     max-width: 200px;
-    font: italic 14px/20px 'Times New Roman', serif;
+    font: 13px/20px Helvetica, Arial, sans-serif;
     position: fixed;
     text-align: right;
     right: 20px;
     bottom: 60px;
     text-shadow: #000 0px 1px 5px;
-    color: #fff;
+    color: #eee;
+    opacity: 0.8;
     display: none;
   }
 
@@ -2441,15 +2515,17 @@ a.button {
 
   .attr {
     position: relative;
-    padding: 170px 20px 20px 20px;
+    padding: 170px 40px 20px;
     background: #333;
     background: rgba(0, 0, 0, .8);
     margin-bottom: 0;
+    margin-top: -20px;
 
-    strong {
+    h1 {
       display: block;
       color: white;
-      font-size: 25px;
+      font-weight: 300;
+      font-size: 34px;
       span {
         color: #76c551;
       }
@@ -2476,16 +2552,16 @@ a.button {
       width: 240px;
       height: 150px;
       padding: 20px 20px 20px 40px;
-      font: 500 24px/25px Helvetica, Arial, sans-serif;
+      font: 500 20px/24px Helvetica, Arial, sans-serif;
       white-space: nowrap;
       color: #fff;
-      background: #76c551
+      background: #76c551;
     }
 
     .byosm span {
       display: inline-block;
-      width: 25px;
-      margin-left: -25px;
+      width: 20px;
+      margin-left: -20px;
     }
   }