X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/245a79061ada4b3ea9e63f2c504e2ec018c529f5..ad01a61b6d07fffff3dedfd476830699c8f50038:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 68eb17e42..6e402f3b8 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -38,7 +38,6 @@ abbr, acronym {
 
 strong {
   font-weight: bold;
-  font-weight: 500;
 }
 
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
@@ -110,13 +109,11 @@ body.slim {
 }
 
 h1, h2, h3 {
-  font-weight: bold;
-  font-weight: 500;
+  font-weight: 600;
   line-height: 1.2;
 }
 
 h4, h5 {
-  font-weight: bold;
   font-weight: 500;
 }
 
@@ -212,8 +209,7 @@ table {
     line-height: $lineheight;
   }
   th {
-    font-weight: bold;
-    font-weight: 500;
+    font-weight: 600;
     vertical-align: top;
   }
   td {
@@ -248,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;
@@ -270,7 +266,7 @@ header {
   img.logo {
     width: 30px;
     height: 30px;
-    margin-top: -4px;
+    margin-top: -2px;
     vertical-align: middle;
   }
 
@@ -310,7 +306,6 @@ nav.primary {
   a.tab,
   .dropdown-toggle {
     display: inline-block;
-    font-weight: bold;
     font-weight: 500;
     color: $green;
     padding: 5px 15px;
@@ -369,8 +364,6 @@ nav.secondary {
 
   .user-menu {
     $border: 1px solid $grey;
-    font-weight: bold;
-    font-weight: 500;
     border: $border;
     border-radius: $border-radius;
     margin-left: 10px;
@@ -397,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;
       }
@@ -414,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;
   }
 
@@ -633,7 +627,7 @@ nav.secondary {
     float: left;
     width: $sidebarWidth;
     background: #fff;
-    font-size: 13px;
+    font-size: 12px;
 
     h2 {
       padding: $lineheight $lineheight $lineheight/2;
@@ -642,6 +636,7 @@ nav.secondary {
     h3, h4 {
       margin-top: $lineheight;
       margin-bottom: $lineheight/2;
+      font-size: 13px;
     }
 
     .icon.close {
@@ -650,19 +645,28 @@ nav.secondary {
     }
   }
 
+  .welcome {
+    display: none;
+  }
+
   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
     border-bottom-right-radius: 5px;
     overflow: hidden;
+    .welcome {
+      display: block;
+    }
+    #sidebar_content {
+      display: none;
+    }
   }
 
   .welcome {
     p {
       padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;
-      font-weight: normal;
       font-weight: 300;
     }
 
@@ -748,8 +752,7 @@ nav.secondary {
         padding: 2px 6px;
         border-bottom-right-radius: 3px;
         cursor: pointer;
-        font-weight: bold;
-        font-weight: 500;
+        font-weight: 600;
         font-size: 16px;
         text-stroke: 2px #fff;
         background: rgba(255,255,255,.9);
@@ -885,6 +888,12 @@ nav.secondary {
   p {
     padding: $lineheight;
   }
+
+  input {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }
 }
 
 #sidebar {
@@ -893,7 +902,7 @@ nav.secondary {
   .load_more {
     text-align: center;
     margin: $lineheight auto;
-    width: $lineheight;
+    width: 40px;
     display: block;
   }
 }
@@ -907,6 +916,7 @@ header .search_form {
 .search_form {
   position: relative;
   padding: $lineheight/2;
+  padding-top: 1px;
   background-color: $lightgrey;
 
   .query_wrapper {
@@ -937,13 +947,15 @@ header .search_form {
     border-radius: 0 2px 2px 0;
   }
 
-  .describe_location {
-    position: absolute;
-    top: 6px;
-    right: 6px;
+  .query_options {
+    text-align: right;
     font-size: 10px;
     color: $blue;
   }
+
+  .routing {
+    display: none;
+  }
 }
 
 /* Rules for the map key which appears in the popout sidebar */
@@ -980,6 +992,33 @@ header .search_form {
   color: #f00;
 }
 
+/* Rules for routing */
+
+#sidebar_content>table {
+    padding: 5px 20px 10px 15px;
+    width: 100%;
+    border-collapse: separate;
+}
+
+td.direction {
+    background-image: image-url('routing-sprite.png'); 
+    width: 20px; height: 20px; 
+    background-repeat: no-repeat;
+}
+@for $i from 1 through 17 {
+td.direction.i#{$i}  { background-position: #{($i)*-20+20}px 0px; }
+}
+
+td.instruction, td.distance {
+    padding-top: 0;
+    border-bottom: 1px solid #DDD;
+}
+td.distance {
+    color: #BBB;
+    text-align: right;
+    font-size: x-small;
+}
+
 /* Rules for entity history */
 
 #sidebar_content {
@@ -997,7 +1036,7 @@ header .search_form {
 
 #sidebar .changesets {
   li {
-    padding: $lineheight;
+    padding: 15px 20px;
     border-bottom: 1px solid #ddd;
     cursor: pointer;
 
@@ -1006,7 +1045,7 @@ header .search_form {
   }
 
   h4 {
-    margin-top: 0;
+    margin: 0;
     a {
       color: #000;
     }
@@ -1022,10 +1061,11 @@ header .search_form {
 
     h4:first-child {
       margin-top: 0;
+      word-wrap: break-word;
     }
   }
 
-  :last-child {
+  .browse-section:last-of-type {
     border-bottom: none;
   }
 
@@ -1066,25 +1106,25 @@ header .search_form {
     border: 1px solid #ddd;
     border-radius: 3px;
     font-size: 12px;
+    table-layout: fixed;
+    border-collapse: separate;
 
-    li {
+    th, td {
       border-bottom: 1px solid #ddd;
     }
 
-    li:last-child {
+    tr:last-child th, tr:last-child td {
       border-bottom: 0;
     }
 
     .browse-tag-k,
     .browse-tag-v {
-      display: inline-block;
       width: 50%;
-      float: left;
       padding: 6px 10px;
+      word-wrap: break-word;
     }
 
     .browse-tag-k {
-      font-weight: bold;
       font-weight: 500;
       background-color: #F6F6F6;
     }
@@ -1110,6 +1150,7 @@ header .search_form {
   }
 
   .note-description {
+    overflow: hidden;
     margin: 0 0 10px 10px;
   }
 }
@@ -1128,16 +1169,35 @@ header .search_form {
     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;
+    margin-bottom: $lineheight;
   }
 
   dl {
@@ -1161,6 +1221,7 @@ header .search_form {
 
   #map {
     height: 100%;
+    overflow: hidden;
   }
 }
 
@@ -1173,7 +1234,7 @@ header .search_form {
 }
 
 .content-body {
-  h1, h2, h3, p {
+  h1, h2, h3, p, ul, ol {
     margin-bottom: $lineheight;
   }
 
@@ -1245,7 +1306,7 @@ header .search_form {
   right: 0;
   bottom: 0;
   border: 0;
-  z-index: 1000;
+  z-index: 2000;
 }
 
 #slim_container {
@@ -1651,6 +1712,10 @@ header .search_form {
   vertical-align: middle;
 }
 
+.inbox-sent {
+  white-space: nowrap;
+}
+
 .inbox-mark-unread,
 .inbox-mark-read,
 .inbox-delete {
@@ -1663,6 +1728,7 @@ header .search_form {
 
 .message-read .message-buttons {
   margin-top: $lineheight;
+  margin-bottom: $lineheight * 1.5;
   padding-top: $lineheight;
   border-top: 1px solid $lightgrey;
 }
@@ -1690,12 +1756,6 @@ header .search_form {
 
 /* Rules for highlighting fields with rails validation errors */
 
-.field_with_errors {
-  padding: 2px;
-  background-color: #ff7070;
-  display: inline-block;
-}
-
 .formError {
   display: inline-block;
   padding: 5px 10px;
@@ -1719,7 +1779,6 @@ header .search_form {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
     font-weight: bold;
-    font-weight: 500;
     font-size: 12px;
     background-color: #c00;
     color: #fff;
@@ -1753,7 +1812,6 @@ header .search_form {
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     font-weight: bold;
-    font-weight: 500;
     line-height: 1.5;
   }
   label.standard-label.secondary {
@@ -1810,6 +1868,10 @@ textarea {
   padding: 2px 5px;
   margin: 0;
   width: 200px;
+
+  &.field_with_errors {
+    border: 2px solid #ff7070;
+  }
 }
 
 textarea {
@@ -1836,6 +1898,8 @@ img.user_thumbnail {
 }
 
 img.user_thumbnail_tiny {
+  width: auto;
+  height: auto;
   max-width: 25px;
   max-height: 25px;
   border: 1px solid #ccc;
@@ -2083,14 +2147,32 @@ a.button {
 
 /* Rules for rich text editors */
 
+input.richtext_title[type="text"] {
+  width: 50%;
+  width: -moz-calc(100% - 235px);
+  width: -webkit-calc(100% - 235px);
+  width: calc(100% - 235px);
+
+  @media only screen and (max-width:768px) {
+    width: 100%;
+  }
+}
+
 .richtext_container {
   margin-bottom: $lineheight;
 
   .richtext_content {
     width: 50%;
+    width: -moz-calc(100% - 235px);
+    width: -webkit-calc(100% - 235px);
+    width: calc(100% - 235px);
     display: inline-block;
     vertical-align: top;
 
+    @media only screen and (max-width:768px) {
+      width: 100%;
+    }
+
     .richtext_preview {
       display: inline-block;
       padding: $lineheight;
@@ -2300,7 +2382,7 @@ a.button {
 }
 
 /* Rules for the "Welcome" page */
-.site-welcome {
+.site-welcome, .site-fixthemap {
   .center {
     text-align: center;
     .sprite { 
@@ -2459,7 +2541,6 @@ a.button {
     h1 {
       display: block;
       color: white;
-      font-weight: normal;
       font-weight: 300;
       font-size: 34px;
       span {