Start to make turn-by-turn instructions clickable

[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 d456e0685cfe481b3691ac3fff085d2b6226cd69..d0732de746dc9732529d5cb3af3e340cc81d15c9 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -38,7 +38,6 @@ abbr, acronym {
 
 strong {
   font-weight: bold;
 
 strong {
   font-weight: bold;

-  font-weight: 500;

 }
 
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 }
 
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */


@@ -110,13 +109,11 @@ body.slim {
 }
 
 h1, h2, h3 {
 }
 
 h1, h2, h3 {

-  font-weight: bold;
-  font-weight: 500;
+  font-weight: 600;

   line-height: 1.2;
 }
 
 h4, h5 {
   line-height: 1.2;
 }
 
 h4, h5 {

-  font-weight: bold;

   font-weight: 500;
 }
 
   font-weight: 500;
 }
 


@@ -212,8 +209,7 @@ table {
     line-height: $lineheight;
   }
   th {
     line-height: $lineheight;
   }
   th {

-    font-weight: bold;
-    font-weight: 500;
+    font-weight: 600;

     vertical-align: top;
   }
   td {
     vertical-align: top;
   }
   td {


@@ -244,13 +240,13 @@ table {
   opacity: 0.6;
 }
 
   opacity: 0.6;
 }
 

-#header {
+header {

   height: $headerHeight;
   position: relative;
   z-index: 1001;
   height: $headerHeight;
   position: relative;
   z-index: 1001;

-  font-size: 13px;
+  font-size: 14px;

 
 

-  h1, .nav, .nav > ul, .nav > ul > li, .user-menu {
+  h1, nav, nav > ul, nav > ul > li, .dropdown {

     display: inline-block;
   }
 
     display: inline-block;
   }
 


@@ -259,7 +255,7 @@ table {
     padding: $lineheight/2;
   }
 
     padding: $lineheight/2;
   }
 

-  h1, .nav.primary {
+  h1, nav.primary {

     float: left;
   }
 
     float: left;
   }
 


@@ -270,7 +266,7 @@ table {
   img.logo {
     width: 30px;
     height: 30px;
   img.logo {
     width: 30px;
     height: 30px;

-    margin-top: -4px;
+    margin-top: -2px;

     vertical-align: middle;
   }
 
     vertical-align: middle;
   }
 


@@ -284,7 +280,7 @@ table {
   }
 }
 
   }
 }
 

-.nav.primary {
+nav.primary {

   > ul {
     $border: 1px solid $green;
 
   > ul {
     $border: 1px solid $green;
 


@@ -310,7 +306,6 @@ table {
   a.tab,
   .dropdown-toggle {
     display: inline-block;
   a.tab,
   .dropdown-toggle {
     display: inline-block;

-    font-weight: bold;

     font-weight: 500;
     color: $green;
     padding: 5px 15px;
     font-weight: 500;
     color: $green;
     padding: 5px 15px;


@@ -347,12 +342,11 @@ table {
   }
 }
 
   }
 }
 

-.nav.secondary {
+nav.secondary {

   position: absolute;
   right: 0;
 
   position: absolute;
   right: 0;
 

-  > ul,
-  > #compact-secondary-nav {
+  > ul {

     vertical-align: middle;
     a, .dropdown-toggle {
       display: inline-block;
     vertical-align: middle;
     a, .dropdown-toggle {
       display: inline-block;


@@ -370,8 +364,6 @@ table {
 
   .user-menu {
     $border: 1px solid $grey;
 
   .user-menu {
     $border: 1px solid $grey;

-    font-weight: bold;
-    font-weight: 500;

     border: $border;
     border-radius: $border-radius;
     margin-left: 10px;
     border: $border;
     border-radius: $border-radius;
     margin-left: 10px;


@@ -398,7 +390,8 @@ table {
     &.logged-in > a {
       padding: 0;
       > .user-button {
     &.logged-in > a {
       padding: 0;
       > .user-button {

-        padding: 5px 10px 5px 6px;
+        line-height: 1.8;
+        padding: 5px 10px 3px 6px;

         display: inline-block;
         color: $darkgrey;
       }
         display: inline-block;
         color: $darkgrey;
       }


@@ -415,7 +408,7 @@ table {
     border: 0;
     vertical-align: top;
     margin-top: 0px;
     border: 0;
     vertical-align: top;
     margin-top: 0px;

-    margin: 3px 0 0 3px;
+    margin: 4px 0 0 4px;

     border-radius: 2px;
   }
 
     border-radius: 2px;
   }
 


@@ -456,7 +449,7 @@ table {
     display: inline-block;
   }
   .compact-hide {
     display: inline-block;
   }
   .compact-hide {

-    display: none !important;
+    display: none;

   }
 }
 
   }
 }
 


@@ -634,7 +627,7 @@ table {
     float: left;
     width: $sidebarWidth;
     background: #fff;
     float: left;
     width: $sidebarWidth;
     background: #fff;

-    font-size: 13px;
+    font-size: 12px;

 
     h2 {
       padding: $lineheight $lineheight $lineheight/2;
 
     h2 {
       padding: $lineheight $lineheight $lineheight/2;


@@ -643,6 +636,7 @@ table {
     h3, h4 {
       margin-top: $lineheight;
       margin-bottom: $lineheight/2;
     h3, h4 {
       margin-top: $lineheight;
       margin-bottom: $lineheight/2;

+      font-size: 13px;

     }
 
     .icon.close {
     }
 
     .icon.close {


@@ -651,19 +645,28 @@ table {
     }
   }
 
     }
   }
 

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

   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
     border-bottom-right-radius: 5px;
     overflow: hidden;
   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
     border-bottom-right-radius: 5px;
     overflow: hidden;

+    .welcome {
+      display: block;
+    }
+    #sidebar_content {
+      display: none;
+    }

   }
 
   .welcome {
     p {
       padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;
   }
 
   .welcome {
     p {
       padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;

-      font-weight: normal;

       font-weight: 300;
     }
 
       font-weight: 300;
     }
 


@@ -749,8 +752,7 @@ table {
         padding: 2px 6px;
         border-bottom-right-radius: 3px;
         cursor: pointer;
         padding: 2px 6px;
         border-bottom-right-radius: 3px;
         cursor: pointer;

-        font-weight: bold;
-        font-weight: 500;
+        font-weight: 600;

         font-size: 16px;
         text-stroke: 2px #fff;
         background: rgba(255,255,255,.9);
         font-size: 16px;
         text-stroke: 2px #fff;
         background: rgba(255,255,255,.9);


@@ -886,6 +888,12 @@ table {
   p {
     padding: $lineheight;
   }
   p {
     padding: $lineheight;
   }

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

 }
 
 #sidebar {
 }
 
 #sidebar {


@@ -894,20 +902,21 @@ table {
   .load_more {
     text-align: center;
     margin: $lineheight auto;
   .load_more {
     text-align: center;
     margin: $lineheight auto;

-    width: $lineheight;
+    width: 40px;

     display: block;
   }
 }
 
 /* Rules for the search box */
 
     display: block;
   }
 }
 
 /* Rules for the search box */
 

-#header .search_form {
+header .search_form {

   display: none;
 }
 
 .search_form {
   position: relative;
   padding: $lineheight/2;
   display: none;
 }
 
 .search_form {
   position: relative;
   padding: $lineheight/2;

+  padding-top: 1px;

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


@@ -938,13 +947,15 @@ table {
     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 */


@@ -981,6 +992,39 @@ table {
   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; }
+}
+
+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%); 
+}
+

 /* Rules for entity history */
 
 #sidebar_content {
 /* Rules for entity history */
 
 #sidebar_content {


@@ -998,7 +1042,7 @@ table {
 
 #sidebar .changesets {
   li {
 
 #sidebar .changesets {
   li {

-    padding: $lineheight;
+    padding: 15px 20px;

     border-bottom: 1px solid #ddd;
     cursor: pointer;
 
     border-bottom: 1px solid #ddd;
     cursor: pointer;
 


@@ -1007,7 +1051,7 @@ table {
   }
 
   h4 {
   }
 
   h4 {

-    margin-top: 0;
+    margin: 0;

     a {
       color: #000;
     }
     a {
       color: #000;
     }


@@ -1023,10 +1067,11 @@ table {
 
     h4:first-child {
       margin-top: 0;
 
     h4:first-child {
       margin-top: 0;

+      word-wrap: break-word;

     }
   }
 
     }
   }
 

-  :last-child {
+  .browse-section:last-of-type {

     border-bottom: none;
   }
 
     border-bottom: none;
   }
 


@@ -1067,25 +1112,25 @@ table {
     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 {

-      font-weight: bold;

       font-weight: 500;
       background-color: #F6F6F6;
     }
       font-weight: 500;
       background-color: #F6F6F6;
     }


@@ -1111,6 +1156,7 @@ table {
   }
 
   .note-description {
   }
 
   .note-description {

+    overflow: hidden;

     margin: 0 0 10px 10px;
   }
 }
     margin: 0 0 10px 10px;
   }
 }


@@ -1129,16 +1175,35 @@ table {
     margin-bottom: $lineheight/2;
     input[type="text"] {
       width: 80px;
     margin-bottom: $lineheight/2;
     input[type="text"] {
       width: 80px;

+      text-align: center;

       margin-bottom: 5px;
     }
   }
 
       margin-bottom: 5px;
     }
   }
 

+  .export_boxy {
+    background: #eee;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+
+    #maxlat { margin-top: -1px; }
+    #minlon {
+      float: left;
+      margin-left: -1px;
+    }
+    #maxlon {
+      float: right;
+      margin-right: -1px;
+    }
+    #minlat { margin-bottom: 0; }
+  }
+

   .export_bound {
     margin: $lineheight/4;
   }
 
   .export_button {
     margin-top: $lineheight;
   .export_bound {
     margin: $lineheight/4;
   }
 
   .export_button {
     margin-top: $lineheight;

+    margin-bottom: $lineheight;

   }
 
   dl {
   }
 
   dl {


@@ -1162,6 +1227,7 @@ table {
 
   #map {
     height: 100%;
 
   #map {
     height: 100%;

+    overflow: hidden;

   }
 }
 
   }
 }
 


@@ -1174,7 +1240,7 @@ table {
 }
 
 .content-body {
 }
 
 .content-body {

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

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


@@ -1246,7 +1312,7 @@ table {
   right: 0;
   bottom: 0;
   border: 0;
   right: 0;
   bottom: 0;
   border: 0;

-  z-index: 1000;
+  z-index: 2000;

 }
 
 #slim_container {
 }
 
 #slim_container {


@@ -1380,6 +1446,10 @@ table {
 }
 
 .user-view {
 }
 
 .user-view {

+  // Silly exception; remove when user page is redesigned.
+  .content-inner {
+    max-width: none;
+  }

   p#no_home_location {
     margin: $lineheight;
   }
   p#no_home_location {
     margin: $lineheight;
   }


@@ -1648,6 +1718,10 @@ table {
   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 {


@@ -1660,6 +1734,7 @@ table {
 
 .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;
 }


@@ -1687,12 +1762,6 @@ table {
 
 /* 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;


@@ -1716,7 +1785,6 @@ table {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
     font-weight: bold;
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
     font-weight: bold;

-    font-weight: 500;

     font-size: 12px;
     background-color: #c00;
     color: #fff;
     font-size: 12px;
     background-color: #c00;
     color: #fff;


@@ -1750,7 +1818,6 @@ table {
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     font-weight: bold;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     font-weight: bold;

-    font-weight: 500;

     line-height: 1.5;
   }
   label.standard-label.secondary {
     line-height: 1.5;
   }
   label.standard-label.secondary {


@@ -1807,6 +1874,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 {


@@ -1833,6 +1904,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;


@@ -2080,14 +2153,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;


@@ -2297,7 +2388,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 { 


@@ -2456,7 +2547,6 @@ a.button {
     h1 {
       display: block;
       color: white;
     h1 {
       display: block;
       color: white;

-      font-weight: normal;

       font-weight: 300;
       font-size: 34px;
       span {
       font-weight: 300;
       font-size: 34px;
       span {