Merge branch 'jfire2' into routing

[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 b6745f809fcfa1e3661f1d8255506778f8f9433b..b552ce850cc13d27464ea82beec1668e40b5f3ac 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -104,10 +104,6 @@ body {
   height: 100%;
 }
 
-body.slim {
-  background-color: #f0f0f0;
-}
-
 h1, h2, h3 {
   font-weight: 600;
   line-height: 1.2;
@@ -888,6 +884,12 @@ nav.secondary {
   p {
     padding: $lineheight;
   }
+
+  input {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }
 }
 
 #sidebar {
@@ -901,15 +903,18 @@ nav.secondary {
   }
 }
 
-/* Rules for the search box */
+/* Rules for the search and direction forms */
 
-header .search_form {
+header .search_forms,
+.directions_form {
   display: none;
 }
 
-.search_form {
+.search_form,
+.directions_form {
   position: relative;
   padding: $lineheight/2;
+  padding-top: 1px;
   background-color: $lightgrey;
 
   .query_wrapper {
@@ -940,10 +945,8 @@ header .search_form {
     border-radius: 0 2px 2px 0;
   }
 
-  .describe_location {
-    position: absolute;
-    top: 6px;
-    right: 6px;
+  .query_options {
+    text-align: right;
     font-size: 10px;
     color: $blue;
   }
@@ -983,6 +986,49 @@ header .search_form {
   color: #f00;
 }
 
+/* Rules for routing */
+
+#sidebar_content>table {
+    padding: 5px 20px 10px 15px;
+    width: 100%;
+    border-collapse: separate;
+}
+
+td.direction {
+    background-image: image-url('routing-sprite.png'); 
+    width: 20px; height: 20px; 
+    background-repeat: no-repeat;
+}
+@for $i from 1 through 17 {
+td.direction.i#{$i}  { background-position: #{($i)*-20+20}px 0px; }
+}
+
+.directions_form input[type="submit"] {
+    margin-top: 30px !important;
+}
+
+p#routing_summary {
+    padding: 0 $lineheight $lineheight/4;
+}
+
+td.instruction, td.distance {
+    padding-top: 0;
+    border-bottom: 1px solid #DDD;
+}
+td.distance {
+    color: #BBB;
+    text-align: right;
+    font-size: x-small;
+}
+tr.turn {
+    cursor: pointer;
+}
+tr.turn:hover {
+    background: lighten($green, 30%); 
+}
+.routing_engines, #route_from, #route_to { margin-left: 25px; }
+.routing_marker { width: 15px; position: absolute; }
+
 /* Rules for entity history */
 
 #sidebar_content {
@@ -1173,6 +1219,15 @@ header .search_form {
   }
 }
 
+/* Rules for the routing sidebar */
+
+#sidebar_content {
+  #routing_credit {
+    text-align: center;
+    padding: 0.5em;
+  }
+}
+
 /* Rules for edit pages */
 
 .site-edit {
@@ -1273,42 +1328,6 @@ header .search_form {
   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 {
@@ -1692,6 +1711,7 @@ header .search_form {
 
 .message-read .message-buttons {
   margin-top: $lineheight;
+  margin-bottom: $lineheight * 1.5;
   padding-top: $lineheight;
   border-top: 1px solid $lightgrey;
 }
@@ -1719,12 +1739,6 @@ header .search_form {
 
 /* Rules for highlighting fields with rails validation errors */
 
-.field_with_errors {
-  padding: 2px;
-  background-color: #ff7070;
-  display: inline-block;
-}
-
 .formError {
   display: inline-block;
   padding: 5px 10px;
@@ -1837,6 +1851,10 @@ textarea {
   padding: 2px 5px;
   margin: 0;
   width: 200px;
+
+  &.field_with_errors {
+    border: 2px solid #ff7070;
+  }
 }
 
 textarea {
@@ -1863,6 +1881,8 @@ img.user_thumbnail {
 }
 
 img.user_thumbnail_tiny {
+  width: auto;
+  height: auto;
   max-width: 25px;
   max-height: 25px;
   border: 1px solid #ccc;
@@ -2345,7 +2365,7 @@ input.richtext_title[type="text"] {
 }
 
 /* Rules for the "Welcome" page */
-.site-welcome {
+.site-welcome, .site-fixthemap {
   .center {
     text-align: center;
     .sprite {