Merge branch 'master' into iD-2.19.6

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 0cdc2c4bb1c1a6dc6c7b04b42e8b02cb7ab83b7a..411e6167bf3e37e64a9d65700121be25ed28da66 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,10 +1,9 @@
 @import "parameters";
 @import "bootstrap";
 @import "parameters";
 @import "bootstrap";

+@import "rails_bootstrap_forms";

 
 /* Styles common to large and small screens */
 
 
 /* Styles common to large and small screens */
 

-.fillL { background-color: white; }
-

 /* Default rules for the body of every page */
 
 body {
 /* Default rules for the body of every page */
 
 body {


@@ -35,10 +34,6 @@ small, aside {
   margin-right: $lineheight/4;
 }
 
   margin-right: $lineheight/4;
 }
 

-.red { color: $red; }
-
-.piwik { border: 0; }
-

 [dir=rtl] { /* no-r2 */ text-align: right; }
 
 [dir=ltr] { /* no-r2 */ text-align: left; }
 [dir=rtl] { /* no-r2 */ text-align: right; }
 
 [dir=ltr] { /* no-r2 */ text-align: left; }


@@ -88,13 +83,6 @@ a {
 
 /* Utility for de-emphasizing content */
 
 
 /* Utility for de-emphasizing content */
 

-.deemphasize {
-  color: $darkgrey;
-  a {
-    color: $blue;
-  }
-}
-

 .text-muted a {
   color: $blue;
 }
 .text-muted a {
   color: $blue;
 }


@@ -451,26 +439,11 @@ body.compact-nav {
 
   .welcome {
     display: none;
 
   .welcome {
     display: none;

-    padding-bottom: 5px;

 
     p {
 
     p {

-      padding: $lineheight/2 $lineheight $lineheight;

       font-size: 110%;
       font-weight: 300;
     }
       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 {
   }
 
   #banner {


@@ -698,10 +671,6 @@ body.compact-nav {
 }
 
 #browse_status {
 }
 
 #browse_status {

-  p {
-    padding: $lineheight;
-  }
-

   input {
     display: block;
     margin-left: auto;
   input {
     display: block;
     margin-left: auto;


@@ -716,8 +685,7 @@ body.compact-nav {
     margin: $lineheight auto;
   }
 
     margin: $lineheight auto;
   }
 

-  .loader,
-  .load_more {
+  .loader {

     text-align: center;
     margin: auto;
     width: 40px;
     text-align: center;
     margin: auto;
     width: 40px;


@@ -725,6 +693,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,
 /* Rules for the search and direction forms */
 
 header .search_forms,


@@ -732,118 +708,6 @@ header .search_forms,
   display: none;
 }
 
   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 {
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey {


@@ -912,8 +776,8 @@ tr.turn {
 tr.turn:hover {
     background: $list-highlight;
 }
 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 */
 
 
 /* Rules for entity history */
 


@@ -1043,11 +907,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;
 
   .note-comments li, .changeset-comments li {
     margin: $lineheight/2 0;
 


@@ -1109,6 +968,16 @@ 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 {
 /* Rules for export sidebar */
 
 .export_form {


@@ -1122,9 +991,8 @@ tr.turn:hover {
   .export_area_inputs {
     margin-bottom: $lineheight/2;
     input[type="text"] {
   .export_area_inputs {
     margin-bottom: $lineheight/2;
     input[type="text"] {

-      width: 80px;
+      width: 100px;

       text-align: center;
       text-align: center;

-      margin-bottom: 5px;

     }
   }
 
     }
   }
 


@@ -1142,18 +1010,13 @@ tr.turn:hover {
       float: right;
       /* no-r2 */ margin-right: -1px;
     }
       float: right;
       /* no-r2 */ margin-right: -1px;
     }

-    #minlat { margin-bottom: 0; }
+    #minlat { margin-bottom: -1px; }

   }
 
   .export_bound {
     margin: $lineheight/4;
   }
 
   }
 
   .export_bound {
     margin: $lineheight/4;
   }
 

-  .export_button {
-    margin-top: $lineheight;
-    margin-bottom: $lineheight;
-  }
-

   dl {
     padding-left: $lineheight/2;
     dd {
   dl {
     padding-left: $lineheight/2;
     dd {


@@ -1270,30 +1133,6 @@ 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 {
 /* Rules for the user profile page */
 
 #userinformation {


@@ -1407,33 +1246,17 @@ tr.turn:hover {
   img.user_thumbnail {
     float: left;
   }
   img.user_thumbnail {
     float: left;
   }

-
-  small.deemphasize {
-    float: left;
-    display: block;
-  }
-}
-
-.pagination {
-  padding-top: $lineheight;

 }
 
 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {
 }
 
 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {

-    position: relative;
-    width: 90%;

     height: 400px;
     border: 1px solid $grey;
     display: none;
     margin-bottom: $lineheight;
   }
     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;
   }
   .comments {
     max-width: 740px;
   }


@@ -1463,22 +1286,15 @@ tr.turn:hover {
   float: left;
 }
 
   float: left;
 }
 

-
-.diary-subscribe-buttons {
-  position:relative;
-  top: -30px;
-  left: 130px;
-}
-

 /* Rules for the log in page */
 
 #login_auth_buttons {
   margin-bottom: 0;
 /* 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 */
 }
 
 /* Rules for the account confirmation page */


@@ -1499,13 +1315,6 @@ tr.turn:hover {
       list-style-type: lower-alpha;
     }
   }
       list-style-type: lower-alpha;
     }
   }

-
-  #decline {
-    background: $lightblue;
-    &:hover {
-      background: darken($lightblue, $hovercolor);
-    }
-  }

 }
 
 /* Rules for the account settings page */
 }
 
 /* Rules for the account settings page */


@@ -1677,92 +1486,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 */
 }
 
 /* Rules for user images */


@@ -1842,54 +1590,6 @@ div.secondary-actions {
 
 .inner02 { padding: 0 $lineheight;}
 
 
 .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"],
 .buttons {
   min-width: 200px;
   input[type="submit"],


@@ -1995,93 +1695,8 @@ a.button {
   }
 }
 
   }
 }
 

-.diary_post .richtext {
-    margin-top: $lineheight;
-  }
-

 .comments .richtext {
   margin-left: 70px;
 .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 */
 }
 
 /* Rules for the user notes list */


@@ -2297,8 +1912,3 @@ input.richtext_title[type="text"] {
     display: none;
   }
 }
     display: none;
   }
 }

-
-.read-reports {
-  background: $lightgrey;
-  opacity: 0.7;
-}