X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6294e9ae59d553278e733d0923e06160b3ae51c2..cdfe2ac21ec01344b4b10d566582e7cc2b2eb7cb:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 448ba9e2b..e7b723d41 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -304,9 +304,7 @@ nav.primary {
       float: left;
       &:last-child { 
         border-right: 0;
-        > a { border-radius: 0 $border-radius $border-radius 0; } 
       }
-      &:first-child > a { border-radius: $border-radius 0 0 $border-radius; }
       > a:hover { background: lighten($green, 30%); }
       &.current > a:hover { background: $green; }
       &.disabled > a:hover { background: lighten($green, 38%); }
@@ -450,30 +448,6 @@ 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 {
@@ -492,7 +466,6 @@ a#ad {
   }
 }
 
-
 /* Utility for styling notification numbers */
 
 .count-number {
@@ -665,12 +638,13 @@ a#ad {
   #sidebar {
     float: left;
     width: $sidebarWidth;
+    background: #fff;
 
     h2, h3, h4 {
       padding: $lineheight $lineheight $lineheight/2;
     }
 
-    h4, span.user, span.date {
+    h4 {
       font-weight: normal;
       color: #666;
       font-size: 12px;
@@ -682,47 +656,39 @@ a#ad {
       cursor: pointer;
     }
 
-    .footer {
-      position: absolute;
-      bottom: 0;
-    }
-
-    p.credits {
-      font-size: 11px;
-      color: #999;
-
-      a {
-        color: #666;
-      }
-    }
-
-    p.large-text {
-      font-size: 1.7em;
-      line-height: 1.4em;
-      font-weight: 300;
-    }
+    -webkit-transition: margin 300ms linear;
+       -moz-transition: margin 300ms linear;
+            transition: margin 300ms linear;
   }
 
-  #sidebar.minimized {
+  .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
-    border-right: none;
+    border-radius: 5px;
+    overflow: hidden;
+    margin-top: $typeheight;
+    margin-left: $typeheight;
+  }
 
-    #sidebar_content {
-      display: none;
+  .welcome {
+    p {
+      padding: $lineheight/2 $lineheight $lineheight;
+      font-size: 110%;
+      font-weight: 300;
     }
 
-    #search_form {
-      background: none;
-      width: 78%;
-    }
+    .button {
+      width: 50%;
+      float: left;
+      margin: 0;
+      border-radius: 0;
+      font-weight: 400;
+      padding: .6em;
 
-    a#ad {
-      margin: 0 $lineheight;
-      width: 64%;
-      padding: 0 6px;
-      border-radius: 3px;
+      &.learn-more {
+        border-right: 1px solid #fff;
+      }
     }
   }
 
@@ -871,7 +837,7 @@ a#ad {
   }
 }
 
-.leaflet-top.leaflet-right {
+.leaflet-top {
   top: $lineheight !important;
   .leaflet-control {
     margin-right: 0px !important;
@@ -921,17 +887,7 @@ a#ad {
   }
 }
 
-#ad + #sidebar_content {
-  top: 70px;
-}
-
 #sidebar_content {
-  position: absolute;
-  top: 50px;
-  bottom: 0;
-  width: 100%;
-  overflow-y: auto;
-
   .loader,
   .load_more {
     text-align: center;
@@ -945,7 +901,7 @@ a#ad {
 
 #search_form {
   position: relative;
-  padding: $lineheight/2 $lineheight;
+  padding: $lineheight/2;
   background-color: $lightgrey;
 
   #query_wrapper {
@@ -1104,6 +1060,10 @@ a.donate {
 
     &.selected { background: #FFFFE6; }
     /* color is derived from changeset bbox fillColor in history.js */
+
+    h4 {
+      padding: 0;
+    }
   }
 
   .comment a {
@@ -1156,6 +1116,7 @@ a.donate {
   }
 
   .browse-tag-list {
+    background-color: #F6F6F6;
     border-top: 1px solid #ddd;
     border-bottom: 1px solid #ddd;
     font-size: 12px;
@@ -1174,7 +1135,6 @@ a.donate {
     .browse-tag-v {
       display: inline-block;
       width: 50%;
-      height: 30px;
       float: left;
       padding: 6px 10px 6px $lineheight;
     }
@@ -1186,6 +1146,7 @@ a.donate {
 
     .browse-tag-v {
       border-left: 1px solid #ddd;
+      background-color: #fff;
     }
   }
 }
@@ -2652,7 +2613,7 @@ a.button {
     &.local        { background-position: 0px    0px; }
     &.community    { background-position: 0px  -40px; }
     &.open         { background-position: 0px  -80px; }
-    &.contributors { background-position: 0px -120px; }
+    &.partners     { background-position: 0px -120px; }
     &.infringement { background-position: 0px -160px; }
   }
 }