X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e64ad3c4281282431b97da7377d7a354b88dc2e9..f1a4669c957d29c012466768581c4a801e5029be:/app/assets/stylesheets/common.css.scss?ds=sidebyside

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 869b28552..f9a6c8b9e 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -141,6 +141,36 @@ 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; }
+.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 {
@@ -389,7 +419,7 @@ table {
 
 /* Rules for donation request box */
 
-.donate {
+a.donate {
   display: block;
   width: 163px;
   padding: $lineheight/4;
@@ -406,11 +436,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,12 +543,82 @@ table {
 }
 
 /* Rules for Leaflet maps */
-.leaflet-control-layers-expanded {
-  padding: 10px !important;
+
+.leaflet-control a {
+  display: block;
+  height: 40px;
+  width: 40px;
+  background-color: white;
+  background-color: rgba(255,255,255,.8);
+  border-radius: 4px;
+  margin-bottom: 10px;
+}
+
+.leaflet-control a.zoomin,
+.control-layers a,
+.control-note a {
+  margin-bottom: 0px;
+  border-radius: 4px 4px 0px 0px;
+}
+
+.leaflet-control a.zoomout {
+  margin-bottom: 0px;
+  border-radius: 0px;
 }
 
-.leaflet-control-layers-separator {
-  margin: 5px -10px !important;
+.control-locate a,
+.control-key a,
+.control-share a {
+  border-radius: 0px 0px 4px 4px;
+}
+
+.leaflet-control a:hover {
+  background-color: white;
+}
+
+.leaflet-control a .icon {
+  margin: 10px;
+}
+
+#map-ui {
+  position: absolute;
+  display: none;
+  right: 0;
+  width: 200px;
+  height: 100%;
+  background: white;
+}
+
+.layers-ui {
+  section {
+    border-top: 1px solid #868e85;
+    padding: 15px;
+  }
+
+  li {
+    border-radius: 4px;
+    overflow: hidden;
+    margin-bottom: 10px;
+  }
+
+  label {
+    display: block;
+    padding: 5px;
+    background-color: #868e85;
+    cursor: pointer;
+  }
+
+  li.active label {
+    background-color: #68c879;
+  }
+
+  .base-layers {
+    .leaflet-container {
+      width: 100%;
+      height: 50px;
+      cursor: pointer;
+    }
+  }
 }
 
 .leaflet-control-attribution {
@@ -1361,6 +1456,13 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   tr th {
     padding: $lineheight/4;
   }
+  p:last-child,
+  h2:last-child,
+  h3:last-child,
+  ol:last-child,
+  ul:last-child {
+    margin-bottom:0;
+  }
   tr td {
     height: 30px;
     border-right: 1px solid $keyline;
@@ -1433,11 +1535,12 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 #errorExplanation {
   width: 400px;
   border: 2px solid #ff7070;
-  padding: $lineheight/2;
+  padding: 0 $lineheight/2;
   margin-bottom: $lineheight;
   background-color: #f0f0f0;
+
   h2 {
-    margin: -10px;
+    margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
     font-weight: bold;
     font-size: 12px;
@@ -1452,11 +1555,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     padding: $lineheight/4;
   }
 
-  ul li {
-    font-size: 12px;
-    list-style: disc;
-  }
+  ul {
+    padding-left: $lineheight;
 
+    li {
+      font-size: 12px;
+      list-style: disc;
+    }
+  }
 }
 
 /* Rules for forms */
@@ -1638,6 +1744,9 @@ a.button {
       background: darken($lightblue, $hovercolor);
     }
   }
+  &:disabled {
+    background: $lightblue;
+  }
   &:last-child {
     margin-bottom: 0;
   }
@@ -1837,12 +1946,12 @@ a.button {
     }
 
     li h4 {
-      width: 35%;
+      width: 40%;
       margin: 0;
     }
 
     li span, li p {
-      width: 60%;
+      width: 50%;
       margin-left: $lineheight/2;
       margin-bottom: $lineheight/4;
       white-space: nowrap;
@@ -1868,11 +1977,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;
   }