Added some vertical space in the routing text input boxes.

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

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index a8fba1943fa0eee84d150d4e1cadae6185a4c45f..fb879d375f1ea44c33a58111bd1743b5f6401b13 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -87,9 +87,7 @@ strong {
 /* Default rules for the body of every page */
 
 * {
 /* Default rules for the body of every page */
 
 * {

-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
+  box-sizing: border-box;

 }
 
 body {
 }
 
 body {


@@ -104,10 +102,6 @@ body {
   height: 100%;
 }
 
   height: 100%;
 }
 

-body.slim {
-  background-color: #f0f0f0;
-}
-

 h1, h2, h3 {
   font-weight: 600;
   line-height: 1.2;
 h1, h2, h3 {
   font-weight: 600;
   line-height: 1.2;


@@ -175,7 +169,7 @@ small, aside {
 .icon.close:hover { background-position: -200px -20px; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
 .icon.close:hover { background-position: -200px -20px; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }

-.icon.gear        { background-position: -260px 0; }
+.icon.query       { background-position: -260px 0; }

 
 /* Rules for links */
 
 
 /* Rules for links */
 


@@ -468,9 +462,8 @@ nav.secondary {
 
 #noscript {
   z-index: 20000000;
 
 #noscript {
   z-index: 20000000;

-  position: absolute;
-  top: 15px;
-  left: 15px;
+  margin-left: 400px;
+  margin-top: 50px;

 }
 
 /* Rules for bootstrap tooltips */
 }
 
 /* Rules for bootstrap tooltips */


@@ -573,16 +566,16 @@ nav.secondary {
     background-color: black;
   }
 
     background-color: black;
   }
 

-  &.active {
-    background-color: #9ed485;
-  }
-

   &.disabled {
     background-color: #333;
     background-color: rgba(0,0,0,.5);
     cursor: default;
   }
 
   &.disabled {
     background-color: #333;
     background-color: rgba(0,0,0,.5);
     cursor: default;
   }
 

+  &.active {
+    background-color: #9ed485;
+  }
+

   .icon {
     margin: 10px;
   }
   .icon {
     margin: 10px;
   }


@@ -687,6 +680,14 @@ nav.secondary {
   #map {
     height: 100%;
     overflow: hidden;
   #map {
     height: 100%;
     overflow: hidden;

+
+    &.query-active {
+      cursor: help;
+    }
+
+    &.query-disabled {
+      cursor: not-allowed;
+    }

   }
 
   #map-ui {
   }
 
   #map-ui {


@@ -850,7 +851,6 @@ nav.secondary {
 
 .leaflet-popup-content-wrapper {
   border-radius: 4px !important;
 
 .leaflet-popup-content-wrapper {
   border-radius: 4px !important;

-  -webkit-border-radius: 4px !important;

 }
 
 /* Rules for attribution text under the main map shown on printouts */
 }
 
 /* Rules for attribution text under the main map shown on printouts */


@@ -907,16 +907,17 @@ nav.secondary {
   }
 }
 
   }
 }
 

-/* Rules for the search box */
+/* Rules for the search and direction forms */

 
 

-header .search_form {
+header .search_forms,
+.directions_form {

   display: none;
 }
 
   display: none;
 }
 

-.search_form {
+.search_form,
+.directions_form {

   position: relative;
   padding: $lineheight/2;
   position: relative;
   padding: $lineheight/2;

-  padding-top: 1px;

   background-color: $lightgrey;
 
   .query_wrapper {
   background-color: $lightgrey;
 
   .query_wrapper {


@@ -928,11 +929,11 @@ header .search_form {
   input[type=text] {
     width: 100%;
     height: 30px;
   input[type=text] {
     width: 100%;
     height: 30px;

-    border-right: none;
-

     transition: 300ms linear;
     transition: 300ms linear;

-    -webkit-transition: 300ms linear;
-    -moz-transition: 300ms linear;
+  }
+
+  input[type=text].overflow {
+    border-right: none;

   }
 
   input:focus {
   }
 
   input:focus {


@@ -940,7 +941,7 @@ header .search_form {
     box-shadow: 0px 0px 7px #9ED485;
   }
 
     box-shadow: 0px 0px 7px #9ED485;
   }
 

-  input[type=submit] {
+  input[type=submit].float {

     float: right;
     width: auto;
     min-width: 0;
     float: right;
     width: auto;
     min-width: 0;


@@ -953,8 +954,39 @@ header .search_form {
     color: $blue;
   }
 
     color: $blue;
   }
 

-  .routing {
-    display: none;
+  .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;
+  }
+
+  span.force_width {
+    width: 100%;
+    padding-right: 25px;
+    display: block;
+  }
+
+  select.routing_engines {
+    min-height: 30px;
+    margin: 0px 0px 5px 25px;
+  }
+
+  div.line {
+    width: 100%;
+    margin: 0px 0px 5px 0px;

   }
 }
 
   }
 }
 


@@ -976,7 +1008,9 @@ header .search_form {
 .search_results_entry {
   ul li {
     border-bottom: $keyline;
 .search_results_entry {
   ul li {
     border-bottom: $keyline;

+    cursor: pointer;

     &:first-child { border-top: $keyline; }
     &:first-child { border-top: $keyline; }

+    &.selected { background: #FFFFE6; }

   }
 
   .search_details {
   }
 
   .search_details {


@@ -1009,6 +1043,10 @@ td.direction {
 td.direction.i#{$i}  { background-position: #{($i)*-20+20}px 0px; }
 }
 
 td.direction.i#{$i}  { background-position: #{($i)*-20+20}px 0px; }
 }
 

+p#routing_summary {
+    padding: 0 $lineheight $lineheight/4;
+}
+

 td.instruction, td.distance {
     padding-top: 0;
     border-bottom: 1px solid #DDD;
 td.instruction, td.distance {
     padding-top: 0;
     border-bottom: 1px solid #DDD;


@@ -1149,7 +1187,7 @@ tr.turn:hover {
     font-size: 90%;
   }
 
     font-size: 90%;
   }
 

-  .note-comments li {
+  .note-comments li, .changeset-comments li {

     margin: $lineheight/2 0;
 
     p {
     margin: $lineheight/2 0;
 
     p {


@@ -1157,10 +1195,59 @@ tr.turn:hover {
     }
   }
 
     }
   }
 

+  .comments-header {
+    float: left;
+  }
+
+  .subscribe-buttons {
+    float: left;
+    margin: 18px 10px 10px;
+    min-width: 80px;
+  }
+
+  .subscribe-buttons input {
+    font-size: 90%;
+    line-height: 15px;
+    min-height: 20px;
+  }
+
+  span.action-button:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+

   .note-description {
     overflow: hidden;
     margin: 0 0 10px 10px;
   }
   .note-description {
     overflow: hidden;
     margin: 0 0 10px 10px;
   }

+
+  .query-intro p {
+    padding: $lineheight $lineheight $lineheight/2;
+  }
+
+  .query-results {
+    display: none;
+
+    h3 {
+      padding: $lineheight $lineheight $lineheight/2;
+      margin: 0;
+    }
+
+    ul {
+      li {
+        padding: 15px 20px;
+        border-bottom: 1px solid #ddd;
+
+        &.query-result {
+          cursor: pointer;
+        }
+
+        &.selected {
+          background: #FFFFE6;
+        }
+      }
+    }
+  }

 }
 
 /* Rules for export sidebar */
 }
 
 /* Rules for export sidebar */


@@ -1326,42 +1413,6 @@ tr.turn:hover {
   z-index: 2000;
 }
 
   z-index: 2000;
 }
 

-#slim_container {
-  width: 100%;
-}
-
-#slim_container_content {
-  max-width: 50em;
-  background-color: #FFFFFF;
-  margin: $lineheight/2 auto;
-  padding: 3px;
-  border-radius: 25px;
-  -moz-border-radius: 25px;
-  border: 1px solid #e6e6e6;
-}
-
-#slim_content {
-  margin: $lineheight/2;
-  margin-top: 95px;
-  max-width: 50em;
-
-  .content-heading {
-    margin-bottom: 15px;
-  }
-}
-
-#slim_header {
-  margin: 30px $lineheight/2;
-  position: absolute;
-  top: 0px;
-  margin-right: $lineheight/4;
-  img {
-    vertical-align: middle;
-    margin-bottom: $lineheight/4;
-    margin-right: $lineheight/4;
-  }
-}
-

 /* Rules for small maps in content areas */
 
 .content_map {
 /* Rules for small maps in content areas */
 
 .content_map {


@@ -1406,6 +1457,30 @@ 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 {
+  .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 {


@@ -1988,7 +2063,6 @@ a.button {
   cursor: pointer;
   border: 0;
   display: inline-block;
   cursor: pointer;
   border: 0;
   display: inline-block;

-  line-height: 20px;

   padding: $lineheight/4 $lineheight/2;
   min-height: 20px + $lineheight/2;
   min-width: 120px;
   padding: $lineheight/4 $lineheight/2;
   min-height: 20px + $lineheight/2;
   min-width: 120px;


@@ -1997,7 +2071,6 @@ a.button {
   background: $blue;
   text-align: center;
   border-radius: 2px;
   background: $blue;
   text-align: center;
   border-radius: 2px;

-  -moz-border-radius: 2px;

   &:hover {
     background: darken($blue, $hovercolor);
     text-decoration: none;
   &:hover {
     background: darken($blue, $hovercolor);
     text-decoration: none;


@@ -2019,6 +2092,16 @@ a.button {
   }
 }
 
   }
 }
 

+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"],


@@ -2166,8 +2249,6 @@ a.button {
 
 input.richtext_title[type="text"] {
   width: 50%;
 
 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: calc(100% - 235px);
 
   @media only screen and (max-width:768px) {


@@ -2180,8 +2261,6 @@ input.richtext_title[type="text"] {
 
   .richtext_content {
     width: 50%;
 
   .richtext_content {
     width: 50%;

-    width: -moz-calc(100% - 235px);
-    width: -webkit-calc(100% - 235px);

     width: calc(100% - 235px);
     display: inline-block;
     vertical-align: top;
     width: calc(100% - 235px);
     display: inline-block;
     vertical-align: top;


@@ -2316,12 +2395,8 @@ input.richtext_title[type="text"] {
   border-radius: 0 3px 3px;
   *border-right-width: 2px;
   *border-bottom-width: 2px;
   border-radius: 0 3px 3px;
   *border-right-width: 2px;
   *border-bottom-width: 2px;

-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  background-clip: padding-box;

 }
 
 .dropdown-menu.pull-right {
 }
 
 .dropdown-menu.pull-right {


@@ -2486,13 +2561,6 @@ input.richtext_title[type="text"] {
   background-size: cover;
   background-attachment: fixed;
 
   background-size: cover;
   background-attachment: fixed;
 

-  &.photo-0 { background-image: image-url('about/0.jpg'); .photo-0 { display: block; } }
-  &.photo-1 { background-image: image-url('about/1.jpg'); .photo-1 { display: block; } }
-  &.photo-2 { background-image: image-url('about/2.jpg'); .photo-2 { display: block; } }
-  &.photo-3 { background-image: image-url('about/4.jpg'); .photo-3 { display: block; } }
-  &.photo-4 { background-image: image-url('about/4.jpg'); .photo-4 { display: block; } }
-  &.photo-5 { background-image: image-url('about/5.jpg'); .photo-5 { display: block; } }
-

   .caption {
     max-width: 200px;
     font: 13px/20px Helvetica, Arial, sans-serif;
   .caption {
     max-width: 200px;
     font: 13px/20px Helvetica, Arial, sans-serif;