X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/254aaaf5fb2135a9f3f1b343331b4d5b3d94fe74..483b2f204e90c657dd4e545c82f2c9094bcacc83:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 66cbb5d2a..1e2ce723d 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -181,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; }
@@ -236,10 +237,21 @@ table {
 
 /* Rules for the header */
 
+#menu-icon { 
+  display: none !important;
+  float: right;
+  background: url("/assets/menu-icon.png") no-repeat;
+  background-size: 30px 30px;
+  display: block;
+  width: 30px;
+  height: 30px;
+  margin: 14px 10px 0 0;
+  opacity: 0.6;
+}
+
 header {
   height: $headerHeight;
   position: relative;
-  // border-bottom: $keyline;
   z-index: 1001;
   font-size: 13px;
 
@@ -286,6 +298,7 @@ nav.primary {
 
     > li {
       border-right: $border;
+      float: left;
       &:last-child { 
         border-right: 0;
         > a { border-radius: 0 $border-radius $border-radius 0; } 
@@ -344,14 +357,16 @@ nav.secondary {
   position: absolute;
   right: 0;
 
-  > ul a,
-  .dropdown-toggle {
-    display: inline-block;
-    text-decoration: none;
-    color: $darkgrey;
-    padding: 5px;
+  > ul {
+    vertical-align: middle;
+    a, .dropdown-toggle {
+      display: inline-block;
+      text-decoration: none;
+      color: $darkgrey;
+      padding: 5px;
 
-    &:hover { color: darken($darkgrey, 10%); }
+      &:hover { color: darken($darkgrey, 10%); }
+    }
   }
 
   > ul li.current a {
@@ -368,6 +383,7 @@ nav.secondary {
 
     > li {
       border-right: $border;
+      float: left;
       &:last-child { 
         border-right: 0;
 
@@ -432,7 +448,7 @@ nav.secondary {
 .count-number {
   padding: 2px $lineheight/4;
   border-radius: 2px;
-  background: #d7d7ff;
+  background: lighten($green, 30%);
   margin: 0 2px;
   font-size: 11px;
   color: #333;
@@ -599,7 +615,6 @@ nav.secondary {
   #sidebar {
     float: left;
     width: $sidebarWidth;
-    border-right: $keyline;
 
     h2, h3, h4 {
       padding: $lineheight $lineheight $lineheight/2;
@@ -614,6 +629,7 @@ nav.secondary {
     .icon.close {
       position: absolute;
       right: $lineheight;
+      cursor: pointer;
     }
 
     .footer {
@@ -691,45 +707,55 @@ nav.secondary {
 }
 
 .layers-ui {
-  li {
-    overflow: hidden;
-    border-radius: 3px;
-    border: 3px solid #fff;
-    margin-bottom: 8px;
-    position: relative;
-    transition: border-color 0.08s ease-in;
-  }
-
-  label {
-    position: absolute;
-    top: 12px;
-    left: 10px;
-    cursor: pointer;
-    font-weight: 500;
-    font-size: 16px;
-    text-stroke: 2px #fff;
-    text-shadow:
-     -2px -2px 1px #fff,  
-      2px -2px 1px #fff,
-      -2px 2px 1px #fff,
-       2px 2px 1px #fff;
-  }
-
-  li.active {
-    border-color: darken($green, 10%);
-  }
-
-  li:hover {
-    border-color: $grey;
-    &.active { border-color: darken($green, 20%); }
-  }
-
   .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: 0;
+        left: 0;
+        padding: 2px 6px;
+        border-bottom-right-radius: 3px;
+        cursor: pointer;
+        font-weight: 500;
+        font-size: 16px;
+        text-stroke: 2px #fff;
+        background: rgba(255,255,255,.9);
+        text-shadow:
+         -2px -2px 1px #fff,  
+          2px -2px 1px #fff,
+          -2px 2px 1px #fff,
+           2px 2px 1px #fff;
+        input[type="radio"] {
+          display: none;
+        }
+      }
+
+      &.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;
+    }
   }
 }
 
@@ -900,19 +926,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;
   }
 }
@@ -1014,10 +1038,13 @@ a.donate {
     padding: $lineheight;
     border-bottom: $keyline;
     cursor: pointer;
+
+    &.selected { background: lighten($green, 35%); }
   }
 
-  li.selected {
-    background: #FCFEA4;
+  .comment a {
+    font-weight: bold;
+    color: #000;
   }
 }
 
@@ -1032,7 +1059,7 @@ a.donate {
     }
   }
 
-  .paginate ul {
+  .paginate ul, .note-comments ul {
     padding-left: 20px;
   }
 
@@ -1091,20 +1118,6 @@ a.donate {
   }
 }
 
-/* Rules for the changeset details */
-
-#sidebar_content {
-  .browse-section.header {
-    padding: 20px;
-    border-bottom: $keyline;
-
-    h2 {
-      padding: 0 0 5px 0;
-      border-bottom: none;
-    }
-  }
-}
-
 /* Rules for export information which appears in the popout sidebar */
 
 .export_bounds {
@@ -1232,12 +1245,6 @@ a.donate {
   }
 }
 
-@media only screen and (max-width:900px) {
-  .header-illustration.new-user-arm {
-    display: none;
-  }
-}
-
 #content.maximised {
   top: 0;
   left: 0;
@@ -2438,7 +2445,8 @@ a.button {
 }
 
 .site-about #content {
-  background-color: #000;
+  //background-color: #000;
+  background-color: #eee;
   background-position: 50% 50%;
   background-repeat: no-repeat;
   background-size: cover;
@@ -2577,3 +2585,10 @@ a.button {
 }
 
 @import 'browse';
+
+@media only screen and (max-width:960px) {
+  .header-illustration.new-user-arm {
+    display: none;
+  }
+}
+