Merge branch 'master' into 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 ab94b5dc7ba6d8ac206f152c1eb725d8263f5a1d..d3268f43b511ffad0c35706971fce2d8ea2cdc0a 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -687,6 +687,10 @@ nav.secondary {
     &.query-active {
       cursor: help;
     }
+
+    &.query-disabled {
+      cursor: not-allowed;
+    }
   }
 
   #map-ui {
@@ -973,7 +977,9 @@ header .search_form {
 .search_results_entry {
   ul li {
     border-bottom: $keyline;
+    cursor: pointer;
     &:first-child { border-top: $keyline; }
+    &.selected { background: #FFFFE6; }
   }
 
   .search_details {
@@ -1140,7 +1146,10 @@ header .search_form {
       li {
         padding: 15px 20px;
         border-bottom: 1px solid #ddd;
-        cursor: pointer;
+
+        &.query-result {
+          cursor: pointer;
+        }
 
         &.selected {
           background: #FFFFE6;
@@ -2432,13 +2441,6 @@ input.richtext_title[type="text"] {
   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;