X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b4e7f5eaca568ec269edc0ddf63fa0d377fd3765..0eb2afa83aee217fc2c6399bd23d0d8152c09eb5:/app/assets/stylesheets/common.scss?ds=sidebyside

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index bfe847446..f8cd32438 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,22 +1,13 @@
 @import "parameters";
 @import "bootstrap";
+@import "rails_bootstrap_forms";
 
 /* Styles common to large and small screens */
 
-.fillL { background-color: white; }
-
 /* Default rules for the body of every page */
 
 body {
-  font-family: 'Helvetica Neue',Arial,sans-serif;
   font-size: $typeheight;
-  line-height: 1.6666;
-  color: #222;
-  background-color: #fff;
-  margin: 0px;
-  padding: 0px;
-  text-align: left;
-  height: 100%;
 }
 
 p > img {
@@ -35,8 +26,6 @@ small, aside {
   margin-right: $lineheight/4;
 }
 
-.piwik { border: 0; }
-
 [dir=rtl] { /* no-r2 */ text-align: right; }
 
 [dir=ltr] { /* no-r2 */ text-align: left; }
@@ -86,13 +75,6 @@ a {
 
 /* Utility for de-emphasizing content */
 
-.deemphasize {
-  color: $darkgrey;
-  a {
-    color: $blue;
-  }
-}
-
 .text-muted a {
   color: $blue;
 }
@@ -372,6 +354,10 @@ body.compact-nav {
       display: none;
     }
 
+    #sidebar_content {
+      padding: $spacer;
+    }
+
     > div {
       position: relative;
       float: left;
@@ -380,7 +366,6 @@ body.compact-nav {
     }
 
     h2 {
-      padding: $lineheight $lineheight $lineheight/2;
       font-size: 1.5rem;
     }
 
@@ -449,26 +434,11 @@ body.compact-nav {
 
   .welcome {
     display: none;
-    padding-bottom: 5px;
 
     p {
-      padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;
       font-weight: 300;
     }
-
-    .button {
-      width: 50%;
-      float: left;
-      margin: 0;
-      border-radius: 0;
-      font-weight: normal;
-      padding: .6em;
-
-      &.learn-more {
-        border-right: 1px solid #fff;
-      }
-    }
   }
 
   #banner {
@@ -696,15 +666,15 @@ body.compact-nav {
 }
 
 #browse_status {
-  p {
-    padding: $lineheight;
-  }
-
   input {
     display: block;
     margin-left: auto;
     margin-right: auto;
   }
+
+  > div {
+   padding: $spacer;
+  }
 }
 
 #sidebar {
@@ -714,8 +684,7 @@ body.compact-nav {
     margin: $lineheight auto;
   }
 
-  .loader,
-  .load_more {
+  .loader {
     text-align: center;
     margin: auto;
     width: 40px;
@@ -723,6 +692,14 @@ body.compact-nav {
   }
 }
 
+/* Temporary label size override until we remove site-wide font customisation */
+
+form {
+  label {
+    font-size: 16px;
+  }
+}
+
 /* Rules for the search and direction forms */
 
 header .search_forms,
@@ -730,118 +707,6 @@ header .search_forms,
   display: none;
 }
 
-.search_form,
-.directions_form {
-  position: relative;
-  padding: $lineheight/2;
-  background-color: $lightgrey;
-
-  .query_wrapper {
-    position: relative;
-    overflow: hidden;
-    border-radius: 2px 0 0 2px;
-  }
-
-  input[type=text] {
-    width: 100%;
-    height: 30px;
-    transition: 300ms linear;
-  }
-
-  input[type=text].overflow {
-    border-right: none;
-    border-radius: 3px 0px 0px 3px;
-  }
-
-  input:focus {
-    outline: none;
-    box-shadow: 0px 0px 7px $vibrant-green;
-  }
-
-  input[type=submit].float {
-    float: right;
-    width: auto;
-    min-width: 0;
-    border-radius: 0 2px 2px 0;
-  }
-
-  input.error {
-    background-color: rgba($red, 0.4);
-  }
-
-  select {
-    /* this next line is to polyfill the vertical alignment of text within a select element,
-     * which is different between firefox and chrome. */
-    padding: 0.3em 0;
-  }
-
-  .query_options {
-    text-align: right;
-    font-size: 10px;
-    color: $blue;
-  }
-
-  .describe_location {
-    position: absolute;
-    top: 6px;
-    right: 6px;
-    font-size: 10px;
-    color: $blue;
-  }
-
-  .switch_link {
-    float: right;
-    width: auto;
-    min-width: 0;
-    margin-left: 6px;
-  }
-
-  img.button {
-    display: block;
-    width: 20px;
-    height: 20px;
-  }
-
-  span.force_width {
-    width: 100%;
-    padding-right: 25px;
-    display: block;
-  }
-
-  select.routing_engines {
-    min-height: 30px;
-    margin: 0px 0px 5px 25px;
-  }
-
-  input.routing_go {
-    min-width: 100px;
-    float: right;
-  }
-
-  div.header {
-    width: 100%;
-    height: 30px;
-  }
-
-  div.line {
-    width: 100%;
-    margin: 0px 0px 5px 0px;
-  }
-
-  div.loader_copy {
-    display: none;
-
-    img {
-      vertical-align: middle;
-    }
-  }
-
-  a.reverse_directions {
-    cursor: pointer;
-    margin: 0px 0px 5px 25px;
-  }
-}
-
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey {
@@ -873,13 +738,6 @@ header .search_forms,
 
 /* Rules for routing */
 
-#sidebar_content>table {
-    padding: 5px 20px 10px 15px;
-    width: 100%;
-    border-collapse: separate;
-    border-spacing: 0;
-}
-
 div.direction {
   background-image: image-url('routing-sprite.png');
   width: 20px;
@@ -890,10 +748,6 @@ div.direction {
 div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
 }
 
-p#routing_summary {
-    padding: 0 $lineheight $lineheight/4;
-}
-
 td.instruction, td.distance {
     padding-top: $lineheight/5;
     padding-bottom: $lineheight/5;
@@ -910,8 +764,8 @@ tr.turn {
 tr.turn:hover {
     background: $list-highlight;
 }
-.routing_engines, #route_from, #route_to { margin-left: 25px; }
-.routing_marker { width: 15px; position: absolute; cursor: move; }
+
+.routing_marker { width: 15px; cursor: move; }
 
 /* Rules for entity history */
 
@@ -937,7 +791,6 @@ tr.turn:hover {
   }
 
   .comments {
-    float: right;
     color: $darkgrey;
   }
 
@@ -955,7 +808,8 @@ tr.turn:hover {
 
 #sidebar_content {
   .browse-section {
-    padding: $lineheight/2 $lineheight;
+    padding-bottom: $spacer;
+    margin-bottom: $spacer;
     border-bottom: 1px solid $grey;
 
     h4:first-child {
@@ -1041,11 +895,6 @@ tr.turn:hover {
     }
   }
 
-  .warning {
-    margin: 0 0 $lineheight/2 0;
-    padding: 0 $lineheight/2;
-  }
-
   .note-comments li, .changeset-comments li {
     margin: $lineheight/2 0;
 
@@ -1081,17 +930,8 @@ tr.turn:hover {
     margin: 0 0 10px 10px;
   }
 
-  .query-intro p {
-    padding: $lineheight $lineheight $lineheight/2;
-  }
-
   .query-results {
     display: none;
-    padding-bottom: $lineheight/2;
-
-    h3 {
-      padding: 0 $lineheight;
-    }
 
     ul {
       li {
@@ -1107,11 +947,19 @@ tr.turn:hover {
   }
 }
 
+/* Bootstrap buttons don't have any vertical margin, so
+   they touch when adjacent buttons wrap onto a new line
+   e.g. wide form buttons on a narrow sidebar */
+
+.btn-wrapper {
+  > .btn {
+    margin-bottom: $spacer * 0.25;
+  }
+}
+
 /* Rules for export sidebar */
 
 .export_form {
-  padding: $lineheight;
-
   .export_area_inputs,
   .export_button {
     text-align: center;
@@ -1120,9 +968,8 @@ tr.turn:hover {
   .export_area_inputs {
     margin-bottom: $lineheight/2;
     input[type="text"] {
-      width: 80px;
+      width: 100px;
       text-align: center;
-      margin-bottom: 5px;
     }
   }
 
@@ -1140,18 +987,13 @@ tr.turn:hover {
       float: right;
       /* no-r2 */ margin-right: -1px;
     }
-    #minlat { margin-bottom: 0; }
+    #minlat { margin-bottom: -1px; }
   }
 
   .export_bound {
     margin: $lineheight/4;
   }
 
-  .export_button {
-    margin-top: $lineheight;
-    margin-bottom: $lineheight;
-  }
-
   dl {
     padding-left: $lineheight/2;
     dd {
@@ -1161,15 +1003,6 @@ tr.turn:hover {
   }
 }
 
-/* Rules for the routing sidebar */
-
-#sidebar_content {
-  #routing_credit {
-    text-align: center;
-    padding: 0.5em;
-  }
-}
-
 /* Rules for edit pages */
 
 .site-edit {
@@ -1194,27 +1027,18 @@ tr.turn:hover {
 
 .content-inner {
   position: relative;
-  max-width: 900px;
+  max-width: 960px;
   margin: auto;
   padding: $lineheight;
 }
 
 /* Overrides for pages that use new layout conventions */
 
-.users-new,
-.users-create,
-.users-terms,
-.users-confirm {
-  .content-heading .content-inner {
-    height: 200px;
-  }
-}
-
 .header-illustration {
   background-position: 0 0;
   background-repeat: no-repeat;
-  position: absolute;
-  height: 200px;
+  position: relative;
+  min-height: 200px;
   width: 100%;
   left: 0;
   bottom: 0;
@@ -1234,9 +1058,10 @@ tr.turn:hover {
   &.new-user-arm {
     height: 110px;
     width: 130px;
-    left: 260px;
-    top: 160px;
+    left: 280px;
+    top: 180px;
     background-image: image-url("sign-up-illustration-arm.png");
+    position: absolute;
     z-index: 100;
   }
 }
@@ -1268,73 +1093,13 @@ tr.turn:hover {
   }
 }
 
-/* Rules for the new trace form */
-
-#new_trace {
-  input[type=text] {
-    width: 50%;
-    width: calc(100% - 150px);
-    max-width: 500px;
-  }
-}
-
-/* Rules for the edit trace form */
-
-.edit_trace {
-  .standard-form-row p {
-    margin-bottom: 0px;
-  }
-
-  input[type=text] {
-    width: 50%;
-    width: calc(100% - 150px);
-    max-width: 500px;
-  }
-}
-
 /* Rules for the user profile page */
 
-#userinformation {
-  min-height: 100px;
-  .userinformation-inner {
-    float: left;
-  }
-  .user-description {
-    width: 100%;
-    clear: both;
-  }
-}
-
-.admin-user-info small {
-  margin-bottom: $lineheight/2;
-  display: inline;
-  margin-right: $lineheight;
-}
-
 .contact-activity {
   margin-top: $lineheight;
   width: 100%;
 }
 
-.activity-details p {
-  margin-left: 70px;
-  margin-bottom: 0;
-}
-
-.users-show {
-  // Silly exception; remove when user page is redesigned.
-  .content-inner {
-    max-width: none;
-  }
-  p#no_home_location {
-    margin: $lineheight;
-  }
-  .user_thumbnail {
-    margin-top: $lineheight/4;
-    float: left;
-  }
-}
-
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {
@@ -1405,33 +1170,17 @@ tr.turn:hover {
   img.user_thumbnail {
     float: left;
   }
-
-  small.deemphasize {
-    float: left;
-    display: block;
-  }
-}
-
-.pagination {
-  padding-top: $lineheight;
 }
 
 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {
-    position: relative;
-    width: 90%;
     height: 400px;
     border: 1px solid $grey;
     display: none;
     margin-bottom: $lineheight;
   }
-  #newcomment {
-    border-top: 1px solid $grey;
-    padding-top: $lineheight;
-    margin-top: $lineheight/2;
-  }
   .comments {
     max-width: 740px;
   }
@@ -1461,22 +1210,15 @@ tr.turn:hover {
   float: left;
 }
 
-
-.diary-subscribe-buttons {
-  position:relative;
-  top: -30px;
-  left: 130px;
-}
-
 /* Rules for the log in page */
 
 #login_auth_buttons {
   margin-bottom: 0;
-}
 
-#login_auth_buttons li {
-  float: left;
-  padding: $lineheight/4 $lineheight/2;
+  li {
+    float: left;
+    padding: $lineheight/4 $lineheight/2;
+  }
 }
 
 /* Rules for the account confirmation page */
@@ -1497,13 +1239,6 @@ tr.turn:hover {
       list-style-type: lower-alpha;
     }
   }
-
-  #decline {
-    background: $lightblue;
-    &:hover {
-      background: darken($lightblue, $hovercolor);
-    }
-  }
 }
 
 /* Rules for the account settings page */
@@ -1616,25 +1351,6 @@ tr.turn:hover {
   &.notice {
     background-color: #CBEEA7;
   }
-
-  div.message {
-    display: inline-block;
-    margin-left: $lineheight / 2;
-    vertical-align: middle;
-
-    p {
-      margin-top: $lineheight * 0.5;
-      margin-bottom: $lineheight * 0.5;
-
-      &:first-child {
-        margin-top: 0px;
-      }
-
-      &:last-child {
-        margin-bottom: 0px;
-      }
-    }
-  }
 }
 
 /* Rules for highlighting fields with rails validation errors */
@@ -1675,92 +1391,31 @@ tr.turn:hover {
   }
 }
 
-/* Rules for forms */
+.search_form {
+  background-color: $lightgrey;
 
-.standard-form {
-  fieldset {
-    margin-bottom: $lineheight;
-  }
-  label.standard-label {
-    display: block;
-    margin-bottom: $lineheight/4;
-    font-size: $typeheight;
-    font-weight: bold;
-    line-height: 1.5;
-  }
-  label.standard-label.secondary {
-    display: inline-block;
-    font-weight: normal;
-  }
-  .form-help {
-    font-weight: normal;
-  }
-  .form-column {
-    float: left;
-    margin-right: 20px;
-  }
-  .form-divider {
-    margin-top: $lineheight;
-    padding-top: $lineheight;
-    border-top: 1px solid $lightgrey;
-  }
-  .horizontal-list .standard-form-row {
-    float: left;
-    padding-right: 10px;
-  }
-  .standard-form-row {
-    margin-bottom: $lineheight/2;
-  }
-  .form-list {
-    margin-bottom: 0;
-  }
-  .form-list li {
-    margin-bottom: 5px;
-    list-style-type: none;
-  }
-  input[type="checkbox"],
-  input[type="radio"] {
-    float: left;
-    margin-top: 5px;
+  .describe_location {
+    top: 6px;
+    right: 6px;
+    font-size: 10px;
+    color: $blue;
   }
 }
 
-#remember_me_openid {
-  display: block;
-}
-
-select {
-  padding: 2px;
-}
-
-input[type="checkbox"],
-input[type="radio"] {
-    margin-right: 5px;
-}
+.directions_form {
+  background-color: $lightgrey;
 
-input[type="text"],
-input[type="email"],
-input[type="url"],
-input[type="password"],
-textarea {
-  color: #222;
-  background-color: #fff;
-  border: 1px solid $grey;
-  border-radius: 3px;
-  padding: 2px 5px;
-  margin: 0;
-  width: 200px;
+  .loader_copy {
+    display: none;
 
-  &.field_with_errors {
-    border: 2px solid #ff7070;
+    img {
+      vertical-align: middle;
+    }
   }
-}
 
-textarea {
-  padding: 5px;
-  width: 100%;
-  min-height: 50px;
-  resize: vertical;
+  a.reverse_directions {
+    cursor: pointer;
+  }
 }
 
 /* Rules for user images */
@@ -1774,6 +1429,12 @@ img.user_image {
   margin-right: $lineheight;
 }
 
+img.user_image_no_margins {
+  max-width: 100px;
+  max-height: 100px;
+  border: 1px solid $grey;
+}
+
 img.user_thumbnail {
   max-width: 50px;
   max-height: 50px;
@@ -1781,6 +1442,12 @@ img.user_thumbnail {
   margin-right: $lineheight;
 }
 
+img.user_thumbnail_no_margins {
+  max-width: 50px;
+  max-height: 50px;
+  border: 1px solid $grey;
+}
+
 img.user_thumbnail_tiny {
   width: auto;
   height: auto;
@@ -1797,28 +1464,28 @@ abbr.geo {
 
 /* General styles for action lists / subnavs / pager navs */
 
-ul.secondary-actions {
-  font-style: normal;
-  margin-bottom: 0;
-  margin-left: 0;
-  padding: 0;
-  &.pager {
-    display: inline-block;
-    margin-right: 60px;
-  }
-  > li {
-    display: block;
-    float: left;
-    list-style: none;
-    border-left: 1px solid $grey;
-    padding-left: $lineheight/2;
-    margin-right: $lineheight/2;
-    &:first-child {
-      border-left: 0;
-      padding-left: 0;
+
+nav.secondary-actions {
+  margin-left: -11px;
+  overflow: hidden;
+  > ul {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin-bottom: 0;
+    margin-left: -1px;
+    padding: 0;
+    &.pager {
+      display: inline-block;
+      margin-right: 60px;
     }
-    &:last-child {
-      margin-right: 0px;
+    > li {
+      flex-basis: auto;
+      list-style: none;
+      border-left: 1px solid $grey;
+      padding-left: $lineheight/2;
+      margin-right: $lineheight/2;
+      margin-bottom: $lineheight/8;
     }
   }
 }
@@ -1828,66 +1495,6 @@ div.secondary-actions {
   text-align: center;
 }
 
-/* Utility for managing inner content areas */
-
-.inner22 { padding: $lineheight;}
-
-.inner12 { padding: $lineheight/2 $lineheight;}
-
-.inner11 { padding: $lineheight/2;}
-
-.inner20 { padding: $lineheight 0;}
-
-.inner02 { padding: 0 $lineheight;}
-
-/* Utility for general button styles */
-
-input[type="button"],
-input[type="submit"],
-input[type="reset"],
-a.button {
-  cursor: pointer;
-  border: 0;
-  display: inline-block;
-  padding: $lineheight/4 $lineheight/2;
-  min-height: 20px + $lineheight/2;
-  min-width: 120px;
-  margin: 0 0 $lineheight/2 0;
-  color: white;
-  background: $blue;
-  text-align: center;
-  border-radius: 2px;
-  &:hover {
-    background: darken($blue, $hovercolor);
-    text-decoration: none;
-  }
-  &.deemphasize {
-    background: $lightblue;
-    &:hover {
-      background: darken($lightblue, $hovercolor);
-    }
-  }
-  &:disabled {
-    background: $lightgrey;
-    &:hover {
-      background: $lightgrey;
-    }
-  }
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
-
-input[type="button"],
-input[type="submit"],
-input[type="reset"] {
-  line-height: normal;
-}
-
-a.button {
-  line-height: 20px;
-}
-
 .buttons {
   min-width: 200px;
   input[type="submit"],
@@ -1942,6 +1549,17 @@ a.button {
   }
 }
 
+/* Create a single-line dl */
+
+dl.dl-inline {
+  dt, dd {
+    display: inline-block;
+  }
+  dd {
+    margin-right: 1em;
+  }
+}
+
 /* Customise the background colour of striped tables */
 
 .table-striped > tbody > tr:nth-child(2n+1) > td,
@@ -1993,93 +1611,8 @@ a.button {
   }
 }
 
-.diary_post .richtext {
-    margin-top: $lineheight;
-  }
-
 .comments .richtext {
   margin-left: 70px;
-  margin-top: 0;
-}
-
-/* Rules for rich text editors */
-
-input.richtext_title[type="text"] {
-  width: 50%;
-  width: calc(100% - 235px);
-
-  @media only screen and (max-width:768px) {
-    width: 100%;
-  }
-}
-
-.richtext_container {
-  margin-bottom: $lineheight;
-
-  .richtext_content {
-    width: 50%;
-    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;
-      background-color: $offwhite;
-      overflow-x: auto;
-
-      &.loading {
-        background-image: image-url("loading.gif");
-        background-repeat: no-repeat;
-        background-position: center;
-      }
-
-      > :first-child {
-        margin-top: 0px;
-      }
-    }
-  }
-
-  .richtext_help {
-    display: inline-block;
-    vertical-align: top;
-    margin-left: 15px;
-    background-color: $offwhite;
-    padding: $lineheight/2;
-    width: 220px;
-
-    ul {
-      margin-bottom: 0;
-    }
-
-    h4.heading, li {
-      border-bottom: 1px solid $grey;
-      margin-bottom: $lineheight/4;
-      padding-bottom: $lineheight/4;
-    }
-
-    li h4, li span, li p {
-      display: inline-block;
-      vertical-align: top;
-      font-size: 11px;
-    }
-
-    li h4 {
-      width: 40%;
-      margin: 0;
-    }
-
-    li span, li p {
-      width: 50%;
-      margin-left: $lineheight/2;
-      margin-bottom: $lineheight/4;
-      white-space: nowrap;
-    }
-  }
 }
 
 /* Rules for the user notes list */
@@ -2183,48 +1716,20 @@ input.richtext_title[type="text"] {
   background-size: cover;
   background-attachment: fixed;
 
-
   .content-inner {
-    position: relative;
-    color: #333;
-    min-width: 320px;
-    max-width: 640px;
-  }
-
-  .text {
-    background: white;
-    padding: 40px;
+    max-width: 760px;
   }
 
   .attr {
-    position: relative;
-    padding: 170px 40px 20px;
-    background: #333;
-    background: rgba(0, 0, 0, .8);
-    margin-bottom: 0;
     margin-top: -20px;
 
     h1 {
-      display: block;
-      color: white;
-      font-weight: 300;
-      font-size: 28px;
       span {
         color: $vibrant-green;
       }
     }
 
-    @include media-breakpoint-up(sm) {
-      h1 {
-        font-size: 34px;
-      }
-    }
-
     .user-image {
-      position: absolute;
-      top: 0px;
-      right: 240px;
-      left: 0px;
       height: 150px;
       background-position: 0 50%;
       background-repeat: no-repeat;
@@ -2234,16 +1739,6 @@ input.richtext_title[type="text"] {
     }
 
     .byosm {
-      position: absolute;
-      top: 0px;
-      right: 0px;
-      z-index: 1;
-      width: 240px;
-      height: 150px;
-      padding: 20px 20px 20px 40px;
-      font: 500 20px/24px Helvetica, Arial, sans-serif;
-      white-space: nowrap;
-      color: #fff;
       background: $vibrant-green;
     }