Merge branch 'overpass'

[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 0195ed32674eb11ebcd9a4d27f939ff8e045c3e5..35ec432b5306e311ddc4663264132c9852248b43 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 */
 
 * {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 body {
@@ -104,10 +102,6 @@ body {
   height: 100%;
 }
 
-body.slim {
-  background-color: #f0f0f0;
-}
-
 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.gear        { background-position: -260px 0; }
+.icon.query       { background-position: -260px 0; }
 
 /* Rules for links */
 
@@ -468,9 +462,8 @@ nav.secondary {
 
 #noscript {
   z-index: 20000000;
-  position: absolute;
-  top: 15px;
-  left: 15px;
+  margin-left: 400px;
+  margin-top: 50px;
 }
 
 /* Rules for bootstrap tooltips */
@@ -687,6 +680,14 @@ nav.secondary {
   #map {
     height: 100%;
     overflow: hidden;
+
+    &.query-active {
+      cursor: help;
+    }
+
+    &.query-disabled {
+      cursor: not-allowed;
+    }
   }
 
   #map-ui {
@@ -850,7 +851,6 @@ nav.secondary {
 
 .leaflet-popup-content-wrapper {
   border-radius: 4px !important;
-  -webkit-border-radius: 4px !important;
 }
 
 /* Rules for attribution text under the main map shown on printouts */
@@ -888,6 +888,12 @@ nav.secondary {
   p {
     padding: $lineheight;
   }
+
+  input {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }
 }
 
 #sidebar {
@@ -924,8 +930,6 @@ header .search_form {
     border-right: none;
 
     transition: 300ms linear;
-    -webkit-transition: 300ms linear;
-    -moz-transition: 300ms linear;
   }
 
   input:focus {
@@ -967,7 +971,9 @@ header .search_form {
 .search_results_entry {
   ul li {
     border-bottom: $keyline;
+    cursor: pointer;
     &:first-child { border-top: $keyline; }
+    &.selected { background: #FFFFE6; }
   }
 
   .search_details {
@@ -1025,10 +1031,11 @@ header .search_form {
 
     h4:first-child {
       margin-top: 0;
+      word-wrap: break-word;
     }
   }
 
-  :last-child {
+  .browse-section:last-of-type {
     border-bottom: none;
   }
 
@@ -1069,21 +1076,22 @@ header .search_form {
     border: 1px solid #ddd;
     border-radius: 3px;
     font-size: 12px;
+    table-layout: fixed;
+    border-collapse: separate;
 
-    li {
+    th, td {
       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 {
-      display: inline-block;
       width: 50%;
-      float: left;
       padding: 6px 10px;
+      word-wrap: break-word;
     }
 
     .browse-tag-k {
@@ -1103,7 +1111,7 @@ header .search_form {
     font-size: 90%;
   }
 
-  .note-comments li {
+  .note-comments li, .changeset-comments li {
     margin: $lineheight/2 0;
 
     p {
@@ -1111,10 +1119,59 @@ header .search_form {
     }
   }
 
+  .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;
   }
+
+  .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 */
@@ -1159,6 +1216,7 @@ header .search_form {
 
   .export_button {
     margin-top: $lineheight;
+    margin-bottom: $lineheight;
   }
 
   dl {
@@ -1182,6 +1240,7 @@ header .search_form {
 
   #map {
     height: 100%;
+    overflow: hidden;
   }
 }
 
@@ -1194,7 +1253,7 @@ header .search_form {
 }
 
 .content-body {
-  h1, h2, h3, p {
+  h1, h2, h3, p, ul, ol {
     margin-bottom: $lineheight;
   }
 
@@ -1266,43 +1325,7 @@ header .search_form {
   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 */
@@ -1349,6 +1372,30 @@ header .search_form {
   }
 }
 
+/* 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 {
@@ -1672,6 +1719,10 @@ header .search_form {
   vertical-align: middle;
 }
 
+.inbox-sent {
+  white-space: nowrap;
+}
+
 .inbox-mark-unread,
 .inbox-mark-read,
 .inbox-delete {
@@ -1684,6 +1735,7 @@ header .search_form {
 
 .message-read .message-buttons {
   margin-top: $lineheight;
+  margin-bottom: $lineheight * 1.5;
   padding-top: $lineheight;
   border-top: 1px solid $lightgrey;
 }
@@ -1711,12 +1763,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;
@@ -1829,6 +1875,10 @@ textarea {
   padding: 2px 5px;
   margin: 0;
   width: 200px;
+
+  &.field_with_errors {
+    border: 2px solid #ff7070;
+  }
 }
 
 textarea {
@@ -1855,6 +1905,8 @@ img.user_thumbnail {
 }
 
 img.user_thumbnail_tiny {
+  width: auto;
+  height: auto;
   max-width: 25px;
   max-height: 25px;
   border: 1px solid #ccc;
@@ -1926,7 +1978,6 @@ a.button {
   cursor: pointer;
   border: 0;
   display: inline-block;
-  line-height: 20px;
   padding: $lineheight/4 $lineheight/2;
   min-height: 20px + $lineheight/2;
   min-width: 120px;
@@ -1935,7 +1986,6 @@ a.button {
   background: $blue;
   text-align: center;
   border-radius: 2px;
-  -moz-border-radius: 2px;
   &:hover {
     background: darken($blue, $hovercolor);
     text-decoration: none;
@@ -1957,6 +2007,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"],
@@ -2102,14 +2162,28 @@ a.button {
 
 /* Rules for rich text editors */
 
+input.richtext_title[type="text"] {
+  width: 50%;
+  width: calc(100% - 235px);
+
+  @media only screen and (max-width:768px) {
+    width: 100%;
+  }
+}
+
 .richtext_container {
   margin-bottom: $lineheight;
 
   .richtext_content {
     width: 50%;
+    width: calc(100% - 235px);
     display: inline-block;
     vertical-align: top;
 
+    @media only screen and (max-width:768px) {
+      width: 100%;
+    }
+
     .richtext_preview {
       display: inline-block;
       padding: $lineheight;
@@ -2236,12 +2310,8 @@ a.button {
   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 {
@@ -2319,7 +2389,7 @@ a.button {
 }
 
 /* Rules for the "Welcome" page */
-.site-welcome {
+.site-welcome, .site-fixthemap {
   .center {
     text-align: center;
     .sprite { 
@@ -2406,13 +2476,6 @@ a.button {
   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;
@@ -2538,6 +2601,36 @@ a.button {
   }
 }
 
+#sidebar #sotm {
+  padding: 10px;
+  min-height: 120px;
+
+  img {
+    float: left;
+    width: 100px;
+    height: 100px;
+  }
+
+  h2 {
+    margin-left: 100px;
+    padding: 7px 10px 6px 15px;
+  }
+
+  p {
+    margin-left: 100px;
+    padding: 6px 10px 7px 15px;
+  }
+
+  a {
+    color: $darkgrey;
+  }
+
+  :hover {
+    text-decoration: none;
+    color: darken($darkgrey, 25%);
+  }
+}
+
 @import 'browse';
 
 @media only screen and (max-width:960px) {