Fix "in bounds" test in updateData

[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 4c23a3c0d124ae908e50ced1ab7352e4237ad7d6..0195ed32674eb11ebcd9a4d27f939ff8e045c3e5 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -36,7 +36,9 @@ abbr, acronym {
   cursor: help;
 }
 
-strong { font-weight: 500; }
+strong {
+  font-weight: bold;
+}
 
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 
@@ -107,11 +109,13 @@ body.slim {
 }
 
 h1, h2, h3 {
-  font-weight: 500;
+  font-weight: 600;
   line-height: 1.2;
 }
 
-h4, h5 { font-weight: 500; }
+h4, h5 {
+  font-weight: 500;
+}
 
 h1 {
   font-size: 18px;
@@ -176,7 +180,7 @@ small, aside {
 /* Rules for links */
 
 a {
-  color: #00f;
+  color: #24d;
   text-decoration: none;
   -webkit-appearance: none;
   outline: 0;
@@ -205,7 +209,7 @@ table {
     line-height: $lineheight;
   }
   th {
-    font-weight: 500;
+    font-weight: 600;
     vertical-align: top;
   }
   td {
@@ -240,7 +244,7 @@ header {
   height: $headerHeight;
   position: relative;
   z-index: 1001;
-  font-size: 13px;
+  font-size: 14px;
 
   h1, nav, nav > ul, nav > ul > li, .dropdown {
     display: inline-block;
@@ -262,7 +266,7 @@ header {
   img.logo {
     width: 30px;
     height: 30px;
-    margin-top: -4px;
+    margin-top: -2px;
     vertical-align: middle;
   }
 
@@ -350,7 +354,7 @@ nav.secondary {
       color: $darkgrey;
       padding: 5px;
 
-      &:hover { color: darken($darkgrey, 10%); }
+      &:hover { color: darken($darkgrey, 25%); }
     }
   }
 
@@ -360,8 +364,6 @@ nav.secondary {
 
   .user-menu {
     $border: 1px solid $grey;
-
-    font-weight: 500;
     border: $border;
     border-radius: $border-radius;
     margin-left: 10px;
@@ -388,7 +390,8 @@ nav.secondary {
     &.logged-in > a {
       padding: 0;
       > .user-button {
-        padding: 5px 10px 5px 6px;
+        line-height: 1.8;
+        padding: 5px 10px 3px 6px;
         display: inline-block;
         color: $darkgrey;
       }
@@ -405,7 +408,7 @@ nav.secondary {
     border: 0;
     vertical-align: top;
     margin-top: 0px;
-    margin: 3px 0 0 3px;
+    margin: 4px 0 0 4px;
     border-radius: 2px;
   }
 
@@ -624,35 +627,40 @@ nav.secondary {
     float: left;
     width: $sidebarWidth;
     background: #fff;
+    font-size: 12px;
 
-    h2, h3, h4 {
+    h2 {
       padding: $lineheight $lineheight $lineheight/2;
     }
 
-    h4 {
-      font-weight: normal;
-      color: #666;
-      font-size: 12px;
+    h3, h4 {
+      margin-top: $lineheight;
+      margin-bottom: $lineheight/2;
+      font-size: 13px;
     }
 
     .icon.close {
       float: right;
       cursor: pointer;
     }
+  }
 
-//    -webkit-transition: margin 300ms linear;
-//       -moz-transition: margin 300ms linear;
-//            transition: margin 300ms linear;
+  .welcome {
+    display: none;
   }
 
   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
-    border-radius: 5px;
+    border-bottom-right-radius: 5px;
     overflow: hidden;
-    margin-top: $lineheight/2;
-    margin-left: $lineheight/2;
+    .welcome {
+      display: block;
+    }
+    #sidebar_content {
+      display: none;
+    }
   }
 
   .welcome {
@@ -667,7 +675,7 @@ nav.secondary {
       float: left;
       margin: 0;
       border-radius: 0;
-      font-weight: 400;
+      font-weight: normal;
       padding: .6em;
 
       &.learn-more {
@@ -703,6 +711,14 @@ nav.secondary {
       color:#222;
       border:1px solid #ddd;
     }
+
+    .tooltip {
+      opacity: 1;
+      border: 1px solid #ccc;
+      .tooltip-arrow {
+        border-top-color: #ccc;
+      }
+    }
   }
 }
 
@@ -736,10 +752,11 @@ nav.secondary {
         padding: 2px 6px;
         border-bottom-right-radius: 3px;
         cursor: pointer;
-        font-weight: 500;
+        font-weight: 600;
         font-size: 16px;
         text-stroke: 2px #fff;
         background: rgba(255,255,255,.9);
+        z-index: 2; // For IE9
         input[type="radio"] {
           display: none;
         }
@@ -758,6 +775,7 @@ nav.secondary {
       font-size: 13px;
       margin-bottom: 8px;
     }
+    li.disabled { color: #999; }
   }
 }
 
@@ -872,12 +890,13 @@ nav.secondary {
   }
 }
 
-#sidebar_content {
+#sidebar {
+  #sidebar_loader,
   .loader,
   .load_more {
     text-align: center;
     margin: $lineheight auto;
-    width: $lineheight;
+    width: 40px;
     display: block;
   }
 }
@@ -930,48 +949,6 @@ header .search_form {
   }
 }
 
-/* Rules for donation request box */
-
-a.donate {
-  display: block;
-  padding: $lineheight/4 $lineheight;
-  border: 1px solid $green;
-  font-size: $typeheight;
-  line-height: 1.4;
-  text-align: center;
-  border-radius: 2px;
-  color: #222;
-  margin: $lineheight/2 $lineheight;
-
-  &:hover {
-    background: $green;
-    text-decoration: none;
-  }
-}
-
-/* Rules for rotating sidebar ads */
-
-.ad-container {
-  display: block;
-  height: 120px;
-  margin: auto;
-  overflow: hidden;
-  position: relative;
-  border-bottom: 1px solid #ccc;
-
-  a {
-    display: block;
-    width: 165px;
-    margin: auto;
-  }
-
-  .ad {
-    height: 100px;
-    border: 0;
-    background: #fff;
-  }
-}
-
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey {
@@ -985,7 +962,7 @@ a.donate {
   }
 }
 
-/* Rules for search results which appear in the popout sidebar */
+/* Rules for search sidebar */
 
 .search_results_entry {
   ul li {
@@ -1006,28 +983,8 @@ a.donate {
   color: #f00;
 }
 
-/* Rules for data browser information which appears in the popout sidebar */
-
-#browse_content {
-  position: relative;
-  .browse_show_list.button {
-    position: absolute;
-    left: $lineheight;
-    right: $lineheight;
-    bottom: -40px;
-    margin-bottom: 0;
-  }
-  a.more-details {
-    position: absolute;
-    top: 0;
-    right: $lineheight;
-  }
-  ul li {
-    margin-bottom: 0;
-  }
-}
-
 /* Rules for entity history */
+
 #sidebar_content {
   .browse_details {
     position: relative;
@@ -1039,44 +996,47 @@ a.donate {
   display: none;
 }
 
-/* Rules for the changeset list shown by the history tab */
+/* Rules for the history sidebar */
 
 #sidebar .changesets {
   li {
-    padding: $lineheight;
-    border-bottom: $keyline;
+    padding: 15px 20px;
+    border-bottom: 1px solid #ddd;
     cursor: pointer;
 
     &.selected { background: #FFFFE6; }
     /* color is derived from changeset bbox fillColor in history.js */
-
-    h4 {
-      padding: 0;
-    }
   }
 
-  .comment a {
-    font-weight: 500;
-    color: #000;
+  h4 {
+    margin: 0;
+    a {
+      color: #000;
+    }
   }
 }
 
-/* Rules for the data browser */
+/* Rules for the browse sidebar */
 
 #sidebar_content {
   .browse-section {
-    padding: 10px 20px;
+    padding: $lineheight/2 $lineheight;
+    border-bottom: 1px solid #ddd;
 
-    h4 {
-      padding: 0;
+    h4:first-child {
+      margin-top: 0;
     }
+  }
 
-    .paginate {
-      float: right;
-      padding: 1px 6px;
-      border: 1px solid #eee;
-      border-radius: 3px;
-    }
+  :last-child {
+    border-bottom: none;
+  }
+
+  .paginate {
+    float: right;
+    padding: 1px 6px;
+    border: 1px solid #eee;
+    border-radius: 3px;
   }
 
   .paginate ul {
@@ -1106,11 +1066,9 @@ a.donate {
 
   .browse-tag-list {
     background-color: #F6F6F6;
-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
+    border: 1px solid #ddd;
+    border-radius: 3px;
     font-size: 12px;
-    margin-left: -$lineheight;
-    margin-right: -$lineheight;
 
     li {
       border-bottom: 1px solid #ddd;
@@ -1125,7 +1083,7 @@ a.donate {
       display: inline-block;
       width: 50%;
       float: left;
-      padding: 6px 10px 6px $lineheight;
+      padding: 6px 10px;
     }
 
     .browse-tag-k {
@@ -1138,38 +1096,73 @@ a.donate {
       background-color: #fff;
     }
   }
-}
 
-/* Rules for export information which appears in the popout sidebar */
+  .warning {
+    margin: $lineheight/2 0;
+    padding: $lineheight/2;
+    font-size: 90%;
+  }
 
-.export_bounds, .export_button {
-  text-align: center;
-}
+  .note-comments li {
+    margin: $lineheight/2 0;
 
-.export_area_inputs {
-  margin-bottom: $lineheight/2;
-  input[type="text"] {
-    width: 80px;
-    margin-bottom: 5px;
+    p {
+      margin-left: 10px;
+    }
   }
-}
 
-.export_bound {
-  margin: $lineheight/4;
+  .note-description {
+    overflow: hidden;
+    margin: 0 0 10px 10px;
+  }
 }
 
-#export_osm {
-  span.small-title { 
-    font-weight: 500;
-    display: block;
-    font-size: 14px;
-    padding-bottom: 5px; 
+/* Rules for export sidebar */
+
+.export_form {
+  padding: $lineheight;
+
+  .export_area_inputs,
+  .export_button {
+    text-align: center;
+  }
+
+  .export_area_inputs {
+    margin-bottom: $lineheight/2;
+    input[type="text"] {
+      width: 80px;
+      text-align: center;
+      margin-bottom: 5px;
+    }
+  }
+
+  .export_boxy {
+    background: #eee;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+
+    #maxlat { margin-top: -1px; }
+    #minlon {
+      float: left;
+      margin-left: -1px;
+    }
+    #maxlon {
+      float: right;
+      margin-right: -1px;
+    }
+    #minlat { margin-bottom: 0; }
+  }
+
+  .export_bound {
+    margin: $lineheight/4;
+  }
+
+  .export_button {
+    margin-top: $lineheight;
   }
 
   dl {
-    padding-left: 30px;
-    font-size: 13px;
-    color: #666;
+    padding-left: $lineheight/2;
     dd {
       margin-left: 0;
       margin-bottom: 10px;
@@ -1407,6 +1400,10 @@ a.donate {
 }
 
 .user-view {
+  // Silly exception; remove when user page is redesigned.
+  .content-inner {
+    max-width: none;
+  }
   p#no_home_location {
     margin: $lineheight;
   }
@@ -1556,7 +1553,7 @@ a.donate {
     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;
-    height: 10em;
+    height: 20em;
   }
 
   #decline {
@@ -1565,11 +1562,6 @@ a.donate {
       background: darken($lightblue, $hovercolor);
     }
   }
-
-  .form-row {
-    margin: auto;
-    max-width: 370px;
-  }
 }
 
 /* Rules for the account settings page */
@@ -1747,7 +1739,7 @@ a.donate {
   h2 {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
-    font-weight: 500;
+    font-weight: bold;
     font-size: 12px;
     background-color: #c00;
     color: #fff;
@@ -1780,7 +1772,7 @@ a.donate {
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
-    font-weight: 500;
+    font-weight: bold;
     line-height: 1.5;
   }
   label.standard-label.secondary {
@@ -1910,7 +1902,6 @@ ul.secondary-actions {
 
 div.secondary-actions {
   padding: 10px;
-  border-top: 1px solid #ccc;
   text-align: center;
 }
 
@@ -2191,66 +2182,6 @@ a.button {
   }
 }
 
-/* Rules for the notes interface */
-
-.leaflet-popup-content .note {
-  padding-top: $lineheight/2;
-}
-
-.leaflet-popup-content .note {
-  h2 {
-    margin-bottom: $lineheight/2;
-  }
-
-  div {
-    margin-top: $lineheight/2;
-  }
-
-  .permalink {
-    position: absolute;
-    top: $lineheight/4;
-    left: $lineheight/4;
-    min-width: 15px;
-    min-height: 15px;
-  }
-
-  .permalink span {
-    display: none;
-    padding-left: $lineheight;
-  }
-
-  .permalink:hover span {
-    display: block;
-  }
-
-  .warning {
-    display: block;
-    background-color: #ffe0cc;
-    padding: 4px 6px;
-    margin-bottom: $lineheight/2;
-  }
-
-  .comment_body {
-    margin-top: 2px;
-    margin-bottom: 2px;
-
-    p {
-      margin-top: 0px;
-      margin-bottom: 0px;
-    }
-  }
-
-  .comment {
-    width: 100%;
-    height: 100px;
-  }
-
-  .buttons {
-    margin-top: $lineheight/4;
-    text-align: right;
-  }
-}
-
 /* Rules for the iD editor */
 
 .id-embed {