From->To->Go order as per @samanpwbb's comment

[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 56285564fdd9794b41e1e48d90a1da787de4252c..5a26d12f3329d7520e71e61205a0e04c063b67db 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -104,10 +104,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;


@@ -888,6 +884,12 @@ nav.secondary {
   p {
     padding: $lineheight;
   }
   p {
     padding: $lineheight;
   }

+
+  input {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }

 }
 
 #sidebar {
 }
 
 #sidebar {


@@ -910,6 +912,7 @@ header .search_form {
 .search_form {
   position: relative;
   padding: $lineheight/2;
 .search_form {
   position: relative;
   padding: $lineheight/2;

+  padding-top: 1px;

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


@@ -940,13 +943,15 @@ header .search_form {
     border-radius: 0 2px 2px 0;
   }
 
     border-radius: 0 2px 2px 0;
   }
 

-  .describe_location {
-    position: absolute;
-    top: 6px;
-    right: 6px;
+  .query_options {
+    text-align: right;

     font-size: 10px;
     color: $blue;
   }
     font-size: 10px;
     color: $blue;
   }

+
+  .routing {
+    display: none;
+  }

 }
 
 /* Rules for the map key which appears in the popout sidebar */
 }
 
 /* Rules for the map key which appears in the popout sidebar */


@@ -983,6 +988,49 @@ header .search_form {
   color: #f00;
 }
 
   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; }
+}
+
+.routing_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 {
 /* Rules for entity history */
 
 #sidebar_content {


@@ -1025,6 +1073,7 @@ header .search_form {
 
     h4:first-child {
       margin-top: 0;
 
     h4:first-child {
       margin-top: 0;

+      word-wrap: break-word;

     }
   }
 
     }
   }
 


@@ -1069,21 +1118,22 @@ header .search_form {
     border: 1px solid #ddd;
     border-radius: 3px;
     font-size: 12px;
     border: 1px solid #ddd;
     border-radius: 3px;
     font-size: 12px;

+    table-layout: fixed;
+    border-collapse: separate;

 
 

-    li {
+    th, td {

       border-bottom: 1px solid #ddd;
     }
 
       border-bottom: 1px solid #ddd;
     }
 

-    li:last-child {
+    tr:last-child th, tr:last-child td {

       border-bottom: 0;
     }
 
     .browse-tag-k,
     .browse-tag-v {
       border-bottom: 0;
     }
 
     .browse-tag-k,
     .browse-tag-v {

-      display: inline-block;

       width: 50%;
       width: 50%;

-      float: left;

       padding: 6px 10px;
       padding: 6px 10px;

+      word-wrap: break-word;

     }
 
     .browse-tag-k {
     }
 
     .browse-tag-k {


@@ -1159,6 +1209,7 @@ header .search_form {
 
   .export_button {
     margin-top: $lineheight;
 
   .export_button {
     margin-top: $lineheight;

+    margin-bottom: $lineheight;

   }
 
   dl {
   }
 
   dl {


@@ -1170,6 +1221,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 {
 /* Rules for edit pages */
 
 .site-edit {


@@ -1195,7 +1255,7 @@ header .search_form {
 }
 
 .content-body {
 }
 
 .content-body {

-  h1, h2, h3, p {
+  h1, h2, h3, p, ul, ol {

     margin-bottom: $lineheight;
   }
 
     margin-bottom: $lineheight;
   }
 


@@ -1267,43 +1327,7 @@ header .search_form {
   right: 0;
   bottom: 0;
   border: 0;
   right: 0;
   bottom: 0;
   border: 0;

-  z-index: 1000;
-}
-
-#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;
-  }
+  z-index: 2000;

 }
 
 /* Rules for small maps in content areas */
 }
 
 /* Rules for small maps in content areas */


@@ -1673,6 +1697,10 @@ header .search_form {
   vertical-align: middle;
 }
 
   vertical-align: middle;
 }
 

+.inbox-sent {
+  white-space: nowrap;
+}
+

 .inbox-mark-unread,
 .inbox-mark-read,
 .inbox-delete {
 .inbox-mark-unread,
 .inbox-mark-read,
 .inbox-delete {


@@ -1685,6 +1713,7 @@ header .search_form {
 
 .message-read .message-buttons {
   margin-top: $lineheight;
 
 .message-read .message-buttons {
   margin-top: $lineheight;

+  margin-bottom: $lineheight * 1.5;

   padding-top: $lineheight;
   border-top: 1px solid $lightgrey;
 }
   padding-top: $lineheight;
   border-top: 1px solid $lightgrey;
 }


@@ -1712,12 +1741,6 @@ header .search_form {
 
 /* Rules for highlighting fields with rails validation errors */
 
 
 /* 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;
 .formError {
   display: inline-block;
   padding: 5px 10px;


@@ -1830,6 +1853,10 @@ textarea {
   padding: 2px 5px;
   margin: 0;
   width: 200px;
   padding: 2px 5px;
   margin: 0;
   width: 200px;

+
+  &.field_with_errors {
+    border: 2px solid #ff7070;
+  }

 }
 
 textarea {
 }
 
 textarea {


@@ -1856,6 +1883,8 @@ img.user_thumbnail {
 }
 
 img.user_thumbnail_tiny {
 }
 
 img.user_thumbnail_tiny {

+  width: auto;
+  height: auto;

   max-width: 25px;
   max-height: 25px;
   border: 1px solid #ccc;
   max-width: 25px;
   max-height: 25px;
   border: 1px solid #ccc;


@@ -2103,14 +2132,32 @@ a.button {
 
 /* Rules for rich text editors */
 
 
 /* Rules for rich text editors */
 

+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: 100%;
+  }
+}
+

 .richtext_container {
   margin-bottom: $lineheight;
 
   .richtext_content {
     width: 50%;
 .richtext_container {
   margin-bottom: $lineheight;
 
   .richtext_content {
     width: 50%;

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

     display: inline-block;
     vertical-align: top;
 
     display: inline-block;
     vertical-align: top;
 

+    @media only screen and (max-width:768px) {
+      width: 100%;
+    }
+

     .richtext_preview {
       display: inline-block;
       padding: $lineheight;
     .richtext_preview {
       display: inline-block;
       padding: $lineheight;


@@ -2320,7 +2367,7 @@ a.button {
 }
 
 /* Rules for the "Welcome" page */
 }
 
 /* Rules for the "Welcome" page */

-.site-welcome {
+.site-welcome, .site-fixthemap {

   .center {
     text-align: center;
     .sprite { 
   .center {
     text-align: center;
     .sprite {