Merge pull request #3676 from harry-wood/notes-disappear-time

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1e638d47d5680888d3066574bf7ef3a2666554e2..5a197d9b1be58f801df5d0b22518c971eff19dc6 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -376,25 +376,17 @@ body.small-nav {
     background-color: $vibrant-green;
   }
 
-  .icon {
-    margin: 10px;
-  }
-}
-
-.leaflet-control-group-end + .leaflet-control {
-  padding-top: 10px;
-}
-
-.leaflet-control:first-child,
-.leaflet-control-group-end + .leaflet-control {
-  &.control-button, .control-button:first-child {
+  &-first {
     border-start-start-radius: 4px;
   }
-}
 
-.leaflet-control-group-end {
-  &.control-button, .control-button:last-child {
+  &-last {
     border-end-start-radius: 4px;
+    margin-bottom: 10px;
+  }
+
+  .icon {
+    margin: 10px;
   }
 }
 
@@ -508,14 +500,6 @@ body.small-nav {
       border-bottom: 1px solid $grey;
       padding: 10px 20px;
     }
-
-    .tooltip {
-      opacity: 1;
-      border: 1px solid $grey;
-      .tooltip-arrow {
-        border-top-color: $grey;
-      }
-    }
   }
 }
 
@@ -528,6 +512,13 @@ body.small-nav {
       height: 50%;
     }
 
+    #map-ui {
+      z-index: 9999;
+      width: 100%;
+      height: 50%;
+      overflow-y: scroll;
+    }
+
     .overlay-sidebar {
       #sidebar {
         position: absolute;
@@ -536,16 +527,10 @@ body.small-nav {
         overflow: hidden;
       }
 
-      #map {
+      #map, #map-ui {
         height: 100%;
       }
     }
-
-    #map-ui {
-      z-index: 9999;
-      width: 100%;
-      overflow-y: scroll;
-    }
   }
 }
 
@@ -607,31 +592,6 @@ body.small-nav {
 }
 
 .share-ui {
-  .share-tabs {
-    margin-bottom: 10px;
-
-    a {
-      color: #fff;
-      text-decoration: none;
-      background-color: $lightblue;
-      padding: 5px 10px;
-      border-right: 1px solid #fff;
-    }
-
-    a:first-child {
-      border-right: 1px solid #fff;
-      border-radius: 4px 0 0 4px;
-    }
-
-    a:last-child {
-      border-radius: 0 4px 4px 0;
-    }
-
-    a.active {
-      background-color: $blue;
-    }
-  }
-
   .share-tab {
     display: none;
   }
@@ -721,21 +681,6 @@ body.small-nav {
   }
 }
 
-#sidebar {
-  #sidebar_loader,
-  .search_more {
-    width: 100%;
-    margin: $lineheight auto;
-  }
-
-  .loader {
-    text-align: center;
-    margin: auto;
-    width: 40px;
-    display: block;
-  }
-}
-
 /* Temporary label size override until we remove site-wide font customisation */
 
 form {
@@ -793,7 +738,6 @@ header .search_forms,
 
   .search_more .loader {
     display: none;
-    width: 100%;
   }
 }
 
@@ -1096,6 +1040,10 @@ tr.turn:hover {
 
 [dir=rtl] .header-illustration {
   transform: scaleX(-1);
+
+  h1 {
+    transform: scaleX(-1);
+  }
 }
 
 #content.maximised {
@@ -1133,7 +1081,7 @@ tr.turn:hover {
   min-width: 200px;
   p {
     padding: 0 0 5px 0;
-    margin-top: 0 0 0 60px;
+    margin: 0 0 0 60px;
     font-size: 12px;
   }
 }
@@ -1372,14 +1320,6 @@ tr.turn:hover {
 
 .directions_form {
   background-color: $lightgrey;
-
-  .loader_copy {
-    display: none;
-
-    img {
-      vertical-align: middle;
-    }
-  }
 }
 
 /* Rules for user images */
@@ -1512,15 +1452,6 @@ dl.dl-inline {
     display: block;
   }
 
-  .icon-list {
-    padding-bottom: 20px;
-    div {
-      margin-bottom: 10px;
-      p {
-        padding-top: 10px;
-      }
-    }
-  }
   .sprite.small {
     width: 50px;
     height: 50px;
@@ -1604,8 +1535,6 @@ dl.dl-inline {
   .icon {
     width: 30px;
     height: 30px;
-    margin-right: 10px;
-    vertical-align: middle;
     background: 40px 40px image-url('about/sprite.png') no-repeat;
 
     &.local {