Fix remaining unstyled buttons by moving to bootstrap buttons

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index a13f73d7a8ba0a2aa7228b927da1ea54e664f968..8aee535af1ae444704bcd1ca5f78051fe46b83ad 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,5 +1,6 @@
 @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 */
 


@@ -30,20 +31,11 @@ small, aside {
 
 #container { position: relative; }
 
 
 #container { position: relative; }
 

-.column-1 {
-  width: 50%;
-  margin: 0 0 $lineheight/2 0;
-}
-

 .small_icon {
   vertical-align: middle;
   margin-right: $lineheight/4;
 }
 
 .small_icon {
   vertical-align: middle;
   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; }


@@ -85,7 +77,6 @@ small, aside {
 a {
   color: #24d;
   text-decoration: none;
 a {
   color: #24d;
   text-decoration: none;

-  -webkit-appearance: none;

   outline: 0;
   &:hover {
     text-decoration: underline;
   outline: 0;
   &:hover {
     text-decoration: underline;


@@ -101,6 +92,10 @@ a {
   }
 }
 
   }
 }
 

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

 /* Rules for the header */
 
 #menu-icon {
 /* Rules for the header */
 
 #menu-icon {


@@ -272,7 +267,7 @@ nav.primary, nav.secondary {
   display: none;
 }
 
   display: none;
 }
 

-body.compact {
+body.compact-nav {

   #compact-secondary-nav {
     display: inline-block;
   }
   #compact-secondary-nav {
     display: inline-block;
   }


@@ -700,10 +695,6 @@ body.compact {
 }
 
 #browse_status {
 }
 
 #browse_status {

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

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


@@ -718,8 +709,7 @@ body.compact {
     margin: $lineheight auto;
   }
 
     margin: $lineheight auto;
   }
 

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

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


@@ -727,6 +717,14 @@ body.compact {
   }
 }
 
   }
 }
 

+/* 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,


@@ -734,118 +732,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 {


@@ -1045,11 +931,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;
 


@@ -1196,16 +1077,6 @@ tr.turn:hover {
   background: $lightgrey;
 }
 
   background: $lightgrey;
 }
 

-.content-body {
-  h1, h2, h3, p, ul, ol {
-    margin-bottom: $lineheight;
-  }
-
-  h1, h2, h3 {
-    margin-top: $lineheight/2;
-  }
-}
-

 .content-inner {
   position: relative;
   max-width: 900px;
 .content-inner {
   position: relative;
   max-width: 900px;


@@ -1271,56 +1142,28 @@ tr.turn:hover {
 /* Rules for small maps in content areas */
 
 .content_map {
 /* Rules for small maps in content areas */
 
 .content_map {

-  position: relative;
-  width: 45%;
-  height: 400px;
+  height: 200px;

   border: 1px solid $grey;
   margin-bottom: $lineheight;
   border: 1px solid $grey;
   margin-bottom: $lineheight;

-  float: right;
-}
-
-/* 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;
+@include media-breakpoint-up(md) {
+  .content_map {
+    height: 400px;

   }
 }
 
 /* Rules for the user profile page */
 
 #userinformation {
   }
 }
 
 /* Rules for the user profile page */
 
 #userinformation {

-

   min-height: 100px;
   .userinformation-inner {
     float: left;
   }
   min-height: 100px;
   .userinformation-inner {
     float: left;
   }

-  h2 {
-    margin-top: 0;
-  }

   .user-description {
     width: 100%;
     clear: both;
   }
   .user-description {
     width: 100%;
     clear: both;
   }

-  .deemphasize {
-    margin: 0;
-  }

 }
 
 .admin-user-info small {
 }
 
 .admin-user-info small {


@@ -1329,16 +1172,6 @@ tr.turn:hover {
   margin-right: $lineheight;
 }
 
   margin-right: $lineheight;
 }
 

-.activity-block {
-  clear: left;
-  border-bottom: 1px solid $grey;
-  padding-bottom: $lineheight;
-  float: left;
-  h3 {
-    margin-bottom: $lineheight/2;
-  }
-}
-

 .contact-activity {
   margin-top: $lineheight;
   width: 100%;
 .contact-activity {
   margin-top: $lineheight;
   width: 100%;


@@ -1417,7 +1250,7 @@ tr.turn:hover {
     margin-top: $lineheight/2;
   }
 
     margin-top: $lineheight/2;
   }
 

-  &.deemphasize {
+  &.deleted {

     background-color: #fee;
   }
 
     background-color: #fee;
   }
 


@@ -1472,7 +1305,7 @@ tr.turn:hover {
       padding-top: $lineheight;
       border-top: 1px solid $grey;
     }
       padding-top: $lineheight;
       border-top: 1px solid $grey;
     }

-    &.deemphasize {
+    &.deleted {

       background-color: #fee;
     }
     p {
       background-color: #fee;
     }
     p {


@@ -1536,13 +1369,6 @@ tr.turn:hover {
 
 /* Rules for the account settings page */
 
 
 /* Rules for the account settings page */
 

-#accountForm .user_map {
-  position: relative;
-  width: 500px;
-  height: 400px;
-  border: 1px solid $grey;
-}
-

 #accountForm .user_image {
   margin-bottom: 0;
 }
 #accountForm .user_image {
   margin-bottom: 0;
 }


@@ -1567,11 +1393,6 @@ tr.turn:hover {
   display: inline !important;
 }
 
   display: inline !important;
 }
 

-.content_map.settings_map {
-  width: 50%;
-  float: none;
-}
-

 /* Rules for the oauth settings page */
 
 .oauth_clients .buttons .oauth-edit {
 /* Rules for the oauth settings page */
 
 .oauth_clients .buttons .oauth-edit {


@@ -1640,17 +1461,6 @@ tr.turn:hover {
   display: none;
 }
 
   display: none;
 }
 

-.messages-show .message-buttons {
-  margin-top: $lineheight;
-  margin-bottom: $lineheight * 1.5;
-  padding-top: $lineheight;
-  border-top: 1px solid $lightgrey;
-}
-
-.messages-show .buttons .mark-unread-button {
-  border-radius: 0;
-}
-

 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {


@@ -1774,44 +1584,205 @@ tr.turn:hover {
     float: left;
     margin-top: 5px;
   }
     float: left;
     margin-top: 5px;
   }

-}

 
 

-#remember_me_openid {
-  display: block;
-}
+  #remember_me_openid {
+    display: block;
+  }

 
 

-select {
-  padding: 2px;
-}
+  select {
+    padding: 2px;
+  }

 
 

-input[type="checkbox"],
-input[type="radio"] {
-    margin-right: 5px;
-}
+  input[type="checkbox"],
+  input[type="radio"] {
+      margin-right: 5px;
+  }

 
 

-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;
+  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;
+
+    &.field_with_errors {
+      border: 2px solid #ff7070;
+    }
+  }

 
 

-  &.field_with_errors {
-    border: 2px solid #ff7070;
+  textarea {
+    padding: 5px;
+    width: 100%;
+    min-height: 50px;
+    resize: vertical;

   }
   }

-}

 
 

-textarea {
-  padding: 5px;
-  width: 100%;
-  min-height: 50px;
-  resize: vertical;
+
+  /* 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;
+  }
+
+  .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 user images */
 }
 
 /* Rules for user images */


@@ -1891,54 +1862,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"],


@@ -2259,12 +2182,18 @@ input.richtext_title[type="text"] {
       display: block;
       color: white;
       font-weight: 300;
       display: block;
       color: white;
       font-weight: 300;

-      font-size: 34px;
+      font-size: 28px;

       span {
         color: $vibrant-green;
       }
     }
 
       span {
         color: $vibrant-green;
       }
     }
 

+    @include media-breakpoint-up(sm) {
+      h1 {
+        font-size: 34px;
+      }
+    }
+

     .user-image {
       position: absolute;
       top: 0px;
     .user-image {
       position: absolute;
       top: 0px;


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

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