Add notes sidebar interaction

[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 fad878e79a93ebd3948a9241d00ee2b75a9811a0..24172416f257f254935f104fa0316397952f19c3 100644 (file)
--- 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;
@@ -261,7 +264,7 @@ header {
 
   > * {
     height: 100%;
-    padding: $lineheight/2 $lineheight;
+    padding: $lineheight/2;
   }
 
   h1, nav.primary {
@@ -281,7 +284,7 @@ header {
 
   h1 {
     margin: 0;
-    padding: ($lineheight - 3) $lineheight ($lineheight + 3);
+    padding-top: 15px;
 
     a {
       color: #000;
@@ -301,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%); }
@@ -465,7 +466,6 @@ nav.secondary {
   }
 }
 
-
 /* Utility for styling notification numbers */
 
 .count-number {
@@ -622,6 +622,7 @@ nav.secondary {
 
 .map-layout {
   #content {
+    overflow: hidden;
     position: absolute;
     top: $headerHeight;
     bottom: 0;
@@ -638,57 +639,56 @@ nav.secondary {
   #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;
     }
 
     .icon.close {
-      position: absolute;
-      right: $lineheight;
+      float: right;
       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: $lineheight/2;
+    margin-left: $lineheight/2;
+  }
 
-    #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;
+
+      &.learn-more {
+        border-right: 1px solid #fff;
+      }
     }
   }
 
@@ -756,11 +756,6 @@ nav.secondary {
         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;
         }
@@ -837,8 +832,8 @@ nav.secondary {
   }
 }
 
-.leaflet-top.leaflet-right {
-  top: $lineheight !important;
+.leaflet-top {
+  top: $lineheight/2 !important;
   .leaflet-control {
     margin-right: 0px !important;
     margin-top: 0px !important;
@@ -871,6 +866,8 @@ nav.secondary {
   text-align: center;
 }
 
+.donate-attr { color: darken($green, 10%) !important; }
+
 /* Rules for the sidebar */
 
 .sidebar_heading {
@@ -885,13 +882,13 @@ nav.secondary {
   }
 }
 
-#sidebar_content {
-  position: absolute;
-  top: 50px;
-  bottom: 0;
-  width: 100%;
-  overflow-y: auto;
+#browse_status {
+  p {
+    padding: $lineheight;
+  }
+}
 
+#sidebar_content {
   .loader,
   .load_more {
     text-align: center;
@@ -903,21 +900,25 @@ nav.secondary {
 
 /* Rules for the search box */
 
-#search_form {
+header .search_form {
+  display: none;
+}
+
+.search_form {
   position: relative;
-  padding: $lineheight/2 $lineheight;
+  padding: $lineheight/2;
   background-color: $lightgrey;
 
-  #query_wrapper {
+  .query_wrapper {
     position: relative;
     overflow: hidden;
+    border-radius: 2px 0 0 2px;
   }
 
-  input {
+  input[type=text] {
     width: 100%;
     height: 30px;
     border-right: none;
-    border-radius: 2px 0 0 2px;
 
     transition: 300ms linear;
     -webkit-transition: 300ms linear;
@@ -936,7 +937,7 @@ nav.secondary {
     border-radius: 0 2px 2px 0;
   }
 
-  #describe_location {
+  .describe_location {
     position: absolute;
     top: 6px;
     right: 6px;
@@ -1064,6 +1065,10 @@ a.donate {
 
     &.selected { background: #FFFFE6; }
     /* color is derived from changeset bbox fillColor in history.js */
+
+    h4 {
+      padding: 0;
+    }
   }
 
   .comment a {
@@ -1081,9 +1086,16 @@ a.donate {
     h4 {
       padding: 0;
     }
+
+    .paginate {
+      float: right;
+      padding: 1px 6px;
+      border: 1px solid #eee;
+      border-radius: 3px;
+    }
   }
 
-  .paginate ul, .note-comments ul {
+  .paginate ul {
     padding-left: 20px;
   }
 
@@ -1109,6 +1121,7 @@ a.donate {
   }
 
   .browse-tag-list {
+    background-color: #F6F6F6;
     border-top: 1px solid #ddd;
     border-bottom: 1px solid #ddd;
     font-size: 12px;
@@ -1127,7 +1140,6 @@ a.donate {
     .browse-tag-v {
       display: inline-block;
       width: 50%;
-      height: 30px;
       float: left;
       padding: 6px 10px 6px $lineheight;
     }
@@ -1139,13 +1151,14 @@ a.donate {
 
     .browse-tag-v {
       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;
 }
 
@@ -1979,7 +1992,7 @@ a.button {
     float: left;
     border-radius: 0;
     margin:0;
-    min-width: 100px;
+    min-width: 75px;
     max-width: 180px;
     border-right:1px solid white;
     text-overflow: ellipsis;
@@ -2605,7 +2618,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; }
   }
 }