X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3880ac5de8150eef3cc5b26eb9814f5c1d681afa..c8fb5ad24c5751bd2d43b86e4359381d200af066:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 0ab8069e9..18983242f 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -141,6 +141,37 @@ h6:first-child {
   margin-right: $lineheight/4;
 }
 
+/* Rules for icons */
+
+.icon {
+  display:inline-block;
+  vertical-align:top;
+  width:20px;
+  height:20px;
+  background:transparent image-url("sprite.png") no-repeat 0 0;
+  text-indent:-9999px;
+  overflow:hidden;
+  }
+
+.icon-pre-text {
+    margin-right: 5px;
+}
+
+.icon.search      { background-position: 0 0; }
+.icon.donate      { background-position: -20px 0; }
+.icon.zoomin      { background-position: -40px 0; }
+.icon.zoomout     { background-position: -60px 0; }
+.icon.geolocate   { background-position: -80px 0; }
+.active .icon.geolocate   { background-position: -80px -20px; }
+.icon.layers      { background-position: -100px 0; }
+.icon.key         { background-position: -120px 0; }
+.icon.share       { background-position: -140px 0; }
+.icon.clipboard   { background-position: -160px 0; }
+.icon.link        { background-position: -180px 0; }
+.icon.close       { background-position: -200px 0; }
+.icon.check       { background-position: -220px 0; }
+.icon.note        { background-position: -240px 0; }
+
 /* Rules for links */
 
 a {
@@ -307,19 +338,6 @@ table {
   }
 }
 
-/* Rules for SOTM advert */
-
-#sotm {
-  width: 165px;
-  margin: $lineheight/2;
-  padding: 0px;
-  border: 0px;
-  background: #fff;
-  img {
-    width: 165px;
-  }
-}
-
 /*
  * Rules for "optional boxes" which appear in the left sidebar on
  * certain pages. Current users are the seach box on the main page
@@ -389,7 +407,7 @@ table {
 
 /* Rules for donation request box */
 
-.donate {
+a.donate {
   display: block;
   width: 163px;
   padding: $lineheight/4;
@@ -406,11 +424,6 @@ table {
     background: #9ed485;
     text-decoration: none;
   }
-  span {
-    margin: 0;
-    padding-left: 18px;
-    background: image-url("sprite.png") 0 -29px no-repeat;
-  }
 }
 
 /* Rules for Creative Commons logo button */
@@ -518,27 +531,114 @@ table {
 }
 
 /* Rules for Leaflet maps */
-.leaflet-control-layers-expanded {
-  padding: 10px !important;
+
+.leaflet-control .control-button {
+  display: block;
+  height: 40px;
+  width: 40px;
+  background-color: white;
+  background-color: rgba(255,255,255,.8);
+  border-radius: 4px;
+  margin-bottom: 10px;
+  outline: none;
 }
 
-.leaflet-control-layers-separator {
-  margin: 5px -10px !important;
+.leaflet-control .zoomin,
+.control-layers .control-button {
+  margin-bottom: 0px;
+  border-radius: 4px 4px 0px 0px;
 }
 
-.leaflet-control-attribution {
-  a.disabled {
-    color: #99c9dc;
-    cursor: default;
-    text-decoration: none;
+.site .leaflet-control .zoomout,
+.control-key .control-button {
+  margin-bottom: 0px;
+  border-radius: 0px;
+}
+
+.leaflet-control .zoomout,
+.control-locate .control-button,
+.control-share .control-button {
+  border-radius: 0px 0px 4px 4px;
+}
+
+.leaflet-control .control-button:hover {
+  background-color: white;
+}
+
+.leaflet-control .control-button .icon {
+  margin: 10px;
+}
+
+/* Rules for the home page */
+
+.site-export #map,
+.site-index #map,
+.site-edit #map {
+  height: 100%;
+  overflow: hidden;
+}
+
+#map-ui {
+  display: none;
+  position: relative;
+  float: right;
+  width: 250px;
+  height: 100%;
+  background: white;
+  border-left: 1px solid #CCC;
+  overflow: auto;
+
+  .section {
+    border-bottom: 1px solid #DDD;
+    padding: 15px;
   }
 
-  ul.secondary-actions {
-    float: left;
-    margin-right: $lineheight/4;
+  a.close-button {
+    float: right;
+    padding:5px;
+    font-size:20px;
+    line-height:10px;
+    color:#222;
+    border:1px solid #ddd;
+  }
+}
 
-    &:only-child {
-      margin-right: 0px;
+.layers-ui {
+  ul, li:last-child {
+    margin-bottom: 0;
+  }
+
+  li {
+    border-radius: 4px;
+    overflow: hidden;
+    margin-bottom: 10px;
+  }
+
+  label {
+    display: block;
+    padding: 5px 5px 5px 7px;
+    background-color: #eee;
+    cursor: pointer;
+  }
+
+  li.active label {
+    background-color: #ccc;
+  }
+
+  .base-layers {
+    .leaflet-container {
+      width: 100%;
+      height: 50px;
+      cursor: pointer;
+    }
+  }
+}
+
+.share-ui {
+  .share-link {
+    li {
+      display: inline-block;
+      width: 50%;
     }
   }
 }
@@ -551,11 +651,6 @@ table {
   }
 }
 
-.site-index #map .olControlScaleLine,
-.site-export #map .olControlScaleLine {
-  left: $lineheight/2 !important;
-}
-
 .leaflet-popup-scrolled {
   padding-right: $lineheight;
   border-bottom: 0px !important;
@@ -614,23 +709,11 @@ table {
 
 #sidebar {
   display: none;
-  position: absolute;
+  position: relative;
+  float: left;
   overflow: auto;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
   border-right: 1px solid $keyline;
   width: 33.3333%;
-  .sidebar_heading {
-    position: relative;
-    padding: $lineheight/2 $lineheight;
-    z-index: 9999;
-    background: $offwhite;
-    border-bottom: 1px solid #ccc;
-  }
-  h4 {
-    margin: 0;
-  }
   ul {
     margin-bottom: 0;
     &:last-child {
@@ -645,7 +728,18 @@ table {
   }
 }
 
-#sidebar_close {
+.sidebar_heading {
+  position: relative;
+  padding: $lineheight/2 $lineheight;
+  z-index: 9999;
+  background: $offwhite;
+  border-bottom: 1px solid #ccc;
+  h4 {
+    margin: 0;
+  }
+}
+
+.sidebar_close {
   position: absolute;
   height: $lineheight;
   top: 0px;
@@ -669,7 +763,6 @@ table {
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey {
-  padding: $lineheight $lineheight 0 $lineheight;
  .mapkey-table-key img {
     display: block;
     margin-left: auto;
@@ -876,28 +969,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   margin-bottom: $lineheight;
 }
 
-/* Rules for the home page */
-
-.site-export #map,
-.site-index #map {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-}
-
-/* Rules for the edit page */
-
-.site-edit #map {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-  overflow: hidden;
-}
-
 /* Rules for the changeset list shown by the history tab etc */
 
 #changeset_list {
@@ -1162,7 +1233,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   h1, h2 {
     font-size: 21px;
-    line-height: 1;
+    line-height: 1em;
   }
   small.deemphasize {
     float: left;
@@ -1883,11 +1954,11 @@ a.button {
 
 /* Rules for the notes interface */
 
-.note {
+.leaflet-popup-content .note {
   padding-top: $lineheight/2;
 }
 
-.note {
+.leaflet-popup-content .note {
   h2 {
     margin-bottom: $lineheight/2;
   }