Consistent changeset color

[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 c97870954c89dcd570d191e755ceef22a29e7426..399ac6e61c2f1b8d2c542dda94c48298993a45cc 100644 (file)
--- 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;
@@ -613,6 +629,7 @@ nav.secondary {
     .icon.close {
       position: absolute;
       right: $lineheight;
+      cursor: pointer;
     }
 
     .footer {
@@ -707,23 +724,22 @@ nav.secondary {
       
       label {
         position: absolute;
-        top: 10px;
-        left: 8px;
+        top: 0;
+        left: 0;
         padding: 2px 6px;
-        border-radius: 3px;
+        border-bottom-right-radius: 3px;
         cursor: pointer;
         font-weight: 500;
         font-size: 16px;
         text-stroke: 2px #fff;
-        background: rgba(255,255,255,.8);
+        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"] {
-          vertical-align: middle;
-          margin-bottom: 4px;
+          display: none;
         }
       }
 
@@ -1023,7 +1039,13 @@ a.donate {
     border-bottom: $keyline;
     cursor: pointer;
 
-    &.selected { background: lighten($green, 35%); }
+    &.selected { background: #FFFFE6; }
+    /* color is derived from changeset bbox fillColor in history.js */
+  }
+
+  .comment a {
+    font-weight: bold;
+    color: #000;
   }
 }
 
@@ -1097,20 +1119,6 @@ a.donate {
   }
 }
 
-/* Rules for the changeset details */
-
-#sidebar_content {
-  .browse-section.header {
-    padding: 20px;
-    border-bottom: 1px solid #ccc;
-
-    h2 {
-      padding: 0 0 5px 0;
-      border-bottom: none;
-    }
-  }
-}
-
 /* Rules for export information which appears in the popout sidebar */
 
 .export_bounds {
@@ -1238,12 +1246,6 @@ a.donate {
   }
 }
 
-@media only screen and (max-width:900px) {
-  .header-illustration.new-user-arm {
-    display: none;
-  }
-}
-
 #content.maximised {
   top: 0;
   left: 0;
@@ -2444,7 +2446,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;
@@ -2583,3 +2586,10 @@ a.button {
 }
 
 @import 'browse';
+
+@media only screen and (max-width:960px) {
+  .header-illustration.new-user-arm {
+    display: none;
+  }
+}
+