X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0f6ee7407c173fa21075a68b8b99d520ace43225..774aa0c875157f8a1322920d0498c80025abadc6:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index c43870f4d..a2d3bb955 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;
@@ -237,10 +240,21 @@ table {
 
 /* Rules for the header */
 
+#menu-icon { 
+  display: none !important;
+  float: right;
+  background: image-url("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;
 
@@ -287,6 +301,7 @@ nav.primary {
 
     > li {
       border-right: $border;
+      float: left;
       &:last-child { 
         border-right: 0;
         > a { border-radius: 0 $border-radius $border-radius 0; } 
@@ -345,14 +360,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 {
@@ -369,6 +386,7 @@ nav.secondary {
 
     > li {
       border-right: $border;
+      float: left;
       &:last-child { 
         border-right: 0;
 
@@ -382,6 +400,7 @@ nav.secondary {
 
     a {
       padding: 5px 15px;
+
     }
 
     &.logged-in > a {
@@ -389,7 +408,9 @@ nav.secondary {
       > .user-button {
         padding: 5px 10px 5px 6px;
         display: inline-block;
+        color: $darkgrey;
       }
+      &:hover > .user-button { color: darken($darkgrey, 5%); }
     }
   }
 
@@ -418,7 +439,8 @@ nav.secondary {
 
   .dropdown-menu {
     left: auto;
-    right: 0;
+    right: -1px;
+    border-radius: 3px 0 3px 3px;
 
     .count-number {
       float: right;
@@ -428,12 +450,55 @@ 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 {
   padding: 2px $lineheight/4;
   border-radius: 2px;
-  background: #d7d7ff;
+  background: lighten($green, 30%);
   margin: 0 2px;
   font-size: 11px;
   color: #333;
@@ -605,7 +670,7 @@ nav.secondary {
       padding: $lineheight $lineheight $lineheight/2;
     }
 
-    h4 {
+    h4, span.user, span.date {
       font-weight: normal;
       color: #666;
       font-size: 12px;
@@ -652,6 +717,13 @@ nav.secondary {
       background: none;
       width: 78%;
     }
+
+    a#ad {
+      margin: 0 $lineheight;
+      width: 64%;
+      padding: 0 6px;
+      border-radius: 3px;
+    }
   }
 
   #map {
@@ -833,6 +905,8 @@ nav.secondary {
   text-align: center;
 }
 
+.donate-attr { color: darken($green, 10%) !important; }
+
 /* Rules for the sidebar */
 
 .sidebar_heading {
@@ -847,6 +921,10 @@ nav.secondary {
   }
 }
 
+#ad + #sidebar_content {
+  top: 70px;
+}
+
 #sidebar_content {
   position: absolute;
   top: 50px;
@@ -1024,7 +1102,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: 500;
+    color: #000;
   }
 }
 
@@ -1036,6 +1120,19 @@ a.donate {
 
     h4 {
       padding: 0;
+      border-radius: 3px;
+    
+      &.paginate {
+        margin-top: 4px;
+        padding: 1px 6px;
+        border: 1px solid #eee;
+        span {
+          padding: 0 0 0 14px;
+          float: right;
+          border-left: 1px solid #eee;
+          > a { padding-left: 5px; }
+        }
+      }
     }
   }
 
@@ -1065,12 +1162,14 @@ a.donate {
   }
 
   .browse-tag-list {
-    border: 1px solid #CCC;
-    border-radius: 4px;
+    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 {
@@ -1083,31 +1182,16 @@ a.donate {
       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;
-    }
-  }
-}
-
-/* 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;
+      border-left: 1px solid #ddd;
     }
   }
 }
@@ -1239,12 +1323,6 @@ a.donate {
   }
 }
 
-@media only screen and (max-width:900px) {
-  .header-illustration.new-user-arm {
-    display: none;
-  }
-}
-
 #content.maximised {
   top: 0;
   left: 0;
@@ -2280,6 +2358,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);
@@ -2446,7 +2525,7 @@ a.button {
 
 .site-about #content {
   //background-color: #000;
-  background-color: #ccc;
+  background-color: #eee;
   background-position: 50% 50%;
   background-repeat: no-repeat;
   background-size: cover;
@@ -2585,3 +2664,10 @@ a.button {
 }
 
 @import 'browse';
+
+@media only screen and (max-width:960px) {
+  .header-illustration.new-user-arm {
+    display: none;
+  }
+}
+