Convert the search forms to bootstrap

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c010691c6520a2e7f22c15fbab0dfae3106f0d6a..b989f924c7e4e2acda5cf5d9774feb13358805b5 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -4,8 +4,6 @@
 
 /* Styles common to large and small screens */
 
-.fillL { background-color: white; }
-
 /* Default rules for the body of every page */
 
 body {
@@ -785,8 +783,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 */
 
@@ -977,6 +975,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 {
@@ -1319,13 +1327,6 @@ tr.turn:hover {
       list-style-type: lower-alpha;
     }
   }
-
-  #decline {
-    background: $lightblue;
-    &:hover {
-      background: darken($lightblue, $hovercolor);
-    }
-  }
 }
 
 /* Rules for the account settings page */
@@ -1632,117 +1633,32 @@ tr.turn:hover {
   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;
-    }
+.search_form {
+  background-color: $lightgrey;
 
-    div.header {
-      width: 100%;
-      height: 30px;
-    }
+  .describe_location {
+    top: 6px;
+    right: 6px;
+    font-size: 10px;
+    color: $blue;
+  }
+}
 
-    div.line {
-      width: 100%;
-      margin: 0px 0px 5px 0px;
-    }
+.directions_form {
+  background-color: $lightgrey;
 
-    div.loader_copy {
-      display: none;
+  .loader_copy {
+    display: none;
 
-      img {
-        vertical-align: middle;
-      }
+    img {
+      vertical-align: middle;
     }
+  }
 
-    a.reverse_directions {
-      cursor: pointer;
-      margin: 0px 0px 5px 25px;
-    }
+  a.reverse_directions {
+    cursor: pointer;
   }
 }