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

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 1e2ce723d..9625c656b 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -115,6 +115,7 @@ body {
   margin: 0px;
   padding: 0px;
   text-align: left;
+  height: 100%;
 }
 
 body.slim {
@@ -145,6 +146,8 @@ small, aside {
   font-size: 12px;
 }
 
+#container { position: relative; }
+
 .column-1 {
   width: 50%;
   margin: 0 0 $lineheight/2 0;
@@ -240,7 +243,7 @@ table {
 #menu-icon { 
   display: none !important;
   float: right;
-  background: url("/assets/menu-icon.png") no-repeat;
+  background: image-url("menu-icon.png") no-repeat;
   background-size: 30px 30px;
   display: block;
   width: 30px;
@@ -397,6 +400,7 @@ nav.secondary {
 
     a {
       padding: 5px 15px;
+
     }
 
     &.logged-in > a {
@@ -404,7 +408,9 @@ nav.secondary {
       > .user-button {
         padding: 5px 10px 5px 6px;
         display: inline-block;
+        color: $darkgrey;
       }
+      &:hover > .user-button { color: darken($darkgrey, 5%); }
     }
   }
 
@@ -433,7 +439,8 @@ nav.secondary {
 
   .dropdown-menu {
     left: auto;
-    right: 0;
+    right: -1px;
+    border-radius: 3px 0 3px 3px;
 
     .count-number {
       float: right;
@@ -443,6 +450,49 @@ nav.secondary {
   }
 }
 
+a#ad {
+  width: 100%;
+  display: block;
+  background: rgb(240,151,53);
+  z-index: 999;
+  padding: 1px $lineheight;
+  color: #fff;
+  font-size: 11px;
+  text-transform: uppercase;
+  span.close {
+    float: right;
+    color: #fff;
+    font-size: 10px;
+    line-height: 18px;
+    opacity: .5;
+    text-transform: none;
+    &:hover { opacity: .9; }
+  }
+  &:hover { 
+    background: rgb(220,151,53);
+    text-decoration: none; 
+  }
+}
+
+#compact-secondary-nav {
+  display: none;
+  ul li a {
+    width: 100%;
+    color: #333;
+    &:hover { color: #fff; }
+  }
+}
+
+@media only screen and (max-width:960px) {
+  #compact-secondary-nav {
+    display: inline-block;
+  }
+  .compact-hide {
+    display: none;
+  }
+}
+
+
 /* Utility for styling notification numbers */
 
 .count-number {
@@ -620,7 +670,7 @@ nav.secondary {
       padding: $lineheight $lineheight $lineheight/2;
     }
 
-    h4 {
+    h4, span.user, span.date {
       font-weight: normal;
       color: #666;
       font-size: 12px;
@@ -667,6 +717,13 @@ nav.secondary {
       background: none;
       width: 78%;
     }
+
+    a#ad {
+      margin: 0 $lineheight;
+      width: 64%;
+      padding: 0 6px;
+      border-radius: 3px;
+    }
   }
 
   #map {
@@ -848,6 +905,8 @@ nav.secondary {
   text-align: center;
 }
 
+.donate-attr { color: darken($green, 10%) !important; }
+
 /* Rules for the sidebar */
 
 .sidebar_heading {
@@ -862,6 +921,10 @@ nav.secondary {
   }
 }
 
+#ad + #sidebar_content {
+  top: 70px;
+}
+
 #sidebar_content {
   position: absolute;
   top: 50px;
@@ -1039,11 +1102,12 @@ 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;
+    font-weight: 500;
     color: #000;
   }
 }
@@ -1057,6 +1121,13 @@ a.donate {
     h4 {
       padding: 0;
     }
+
+    .paginate {
+      float: right;
+      padding: 1px 6px;
+      border: 1px solid #eee;
+      border-radius: 3px;
+    }
   }
 
   .paginate ul, .note-comments ul {
@@ -1085,12 +1156,15 @@ a.donate {
   }
 
   .browse-tag-list {
-    border: 1px solid #CCC;
-    border-radius: 4px;
+    background-color: #F6F6F6;
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
     font-size: 12px;
+    margin-left: -$lineheight;
+    margin-right: -$lineheight;
 
     li {
-      border-bottom: 1px solid #CCC;
+      border-bottom: 1px solid #ddd;
     }
 
     li:last-child {
@@ -1101,26 +1175,25 @@ a.donate {
     .browse-tag-v {
       display: inline-block;
       width: 50%;
-      height: 30px;
       float: left;
-      padding: 6px 10px;
+      padding: 6px 10px 6px $lineheight;
     }
 
     .browse-tag-k {
       font-weight: 500;
       background-color: #F6F6F6;
-      border-radius: 4px 0 0 4px;
     }
 
     .browse-tag-v {
-      border-left: 1px solid #CCC;
+      border-left: 1px solid #ddd;
+      background-color: #fff;
     }
   }
 }
 
 /* Rules for export information which appears in the popout sidebar */
 
-.export_bounds {
+.export_bounds, .export_button {
   text-align: center;
 }
 
@@ -2280,6 +2353,7 @@ a.button {
   list-style: none;
   background-color: #ffffff;
   border: 1px solid #ccc;
+  border-radius: 0 3px 3px;
   *border-right-width: 2px;
   *border-bottom-width: 2px;
   -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);