X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f080d161e0d6bda68535176d0003f3dfb133a7b8..5da715756d385851fb4614f8345ca9699a7ed34f:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 42966accd..a73c8e86d 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -250,6 +250,10 @@ table {
 
 #small-title {
   display: none;
+
+  img {
+    vertical-align: text-bottom;
+  }
 }
 
 /* Rules for the introductory text displayed in the left sidebar to new users */
@@ -306,7 +310,7 @@ table {
 .left_menu {
   left: 0px;
   margin: 0;
-  padding: $lineheight/4 $lineheight/2;
+  padding: $lineheight/4 $lineheight/2 $lineheight/2 $lineheight/2;
   font-size: 12px;
   line-height: 1.25;
   list-style-type: none;
@@ -332,10 +336,6 @@ table {
     font-size: 12px;
     margin: 0;
   }
-
-  li:last-child h4 {
-    padding-top: 0;
-  }
 }
 
 /*
@@ -448,6 +448,7 @@ a.donate {
 .site-index #top-bar,
 .site-export #top-bar {
   position: fixed;
+  top: 0;
   left: 0;
   right: 0;
 }
@@ -529,43 +530,138 @@ a.donate {
   left: 15px;
 }
 
+/* Rules for bootstrap tooltips */
+
+.tooltip {
+  position: absolute;
+  display: none;
+  color: #333;
+  text-align: left;
+  font-size: 12px;
+  max-width: 250px;
+}
+
+.tooltip.in {
+  opacity: 0.8;
+  z-index: 1030;
+  height: auto;
+  display: block;
+}
+
+.tooltip.top {
+  margin-top: -10px;
+  text-align: center;
+}
+
+.tooltip.right {
+  margin-left: 10px;
+}
+
+.tooltip.bottom {
+  margin-top: 10px;
+  text-align: center;
+}
+
+.tooltip.left {
+  margin-left: -10px;
+  text-align: right;
+}
+
+.tooltip-inner {
+  display: inline-block;
+  padding: 10px;
+  font-weight: normal;
+  background-color: white;
+}
+
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.tooltip.top .tooltip-arrow {
+  bottom: -5px;
+  left: 50%;
+  margin-left: -5px;
+  border-top-color: white;
+  border-width: 5px 5px 0;
+}
+
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: -5px;
+  margin-top: -5px;
+  border-right-color: white;
+  border-width: 5px 5px 5px 0;
+}
+
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: -5px;
+  margin-top: -5px;
+  border-left-color: white;
+  border-width: 5px 0 5px 5px;
+}
+
+.tooltip.bottom .tooltip-arrow {
+  top: -5px;
+  left: 50%;
+  margin-left: -5px;
+  border-bottom-color: white;
+  border-width: 0 5px 5px;
+}
+
 /* Rules for Leaflet maps */
 
 .leaflet-control .control-button {
   display: block;
   height: 40px;
   width: 40px;
-  background-color: white;
-  background-color: rgba(255,255,255,.8);
-  border-radius: 4px;
+  background-color: #333;
+  background-color: rgba(0,0,0,.6);
+  -bottom: 1px solid #333; 
+  border-radius: 4px 0 0 4px;
   margin-bottom: 10px;
   outline: none;
+
+  &:hover {
+    background-color: black;
+  }
+
+  &.active {
+    background-color: #9ed485;
+  }
+
+  &.disabled {
+    background-color: #333;
+    background-color: rgba(0,0,0,.5);
+    cursor: default;
+  }
+
+  .icon {
+    margin: 10px;
+  }
 }
 
 .leaflet-control .zoomin,
 .control-layers .control-button {
   margin-bottom: 0px;
-  border-radius: 4px 4px 0px 0px;
+  border-radius: 4px 0 0 0;
 }
 
 .site .leaflet-control .zoomout,
 .control-key .control-button {
-  margin-bottom: 0px;
-  border-radius: 0px;
+  margin-bottom: 0;
+  border-radius: 0;
 }
 
-.leaflet-control .zoomout,
+.leaflet-control .zoomout, // For non-main page maps
 .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;
+  border-radius: 0 0 0 4px;
 }
 
 /* Rules for the home page */
@@ -637,18 +733,53 @@ a.donate {
 }
 
 .share-ui {
+  .share-tabs {
+    margin-bottom: 10px;
+
+    a {
+      color: #fff;
+      text-decoration: none;
+      background-color: $lightblue;
+      padding: 5px 10px;
+    }
+
+    a:first-child {
+      border-right: 1px solid #fff;
+      border-radius: 4px 0 0 4px;
+    }
+
+    a:last-child {
+      border-left: 1px solid #fff;
+      border-radius: 0 4px 4px 0;
+    }
+
+    a.active {
+      background-color: $blue;
+    }
+  }
+
+  .share-tab {
+    display: none;
+  }
+
   .share-link {
-    li {
-      display: inline-block;
-      text-align: center;
-      width: 50%;
+    input[type=text],
+    textarea {
+      width: 100%;
+      font-family: monospace;
+      font-size: small;
+      line-height: 1.3;
+    }
+  }
+
+  .share-image {
+    label {
+      margin-right: 10px;
     }
   }
 
   #embed_html {
     resize: vertical;
-    font-family: monospace;
-    font-size: small;
   }
 
   #mapnik_scale {
@@ -656,10 +787,10 @@ a.donate {
   }
 }
 
-.site-index .leaflet-top,
-.site-export .leaflet-top {
+.leaflet-top.leaflet-right {
   top: $lineheight/2 !important;
   .leaflet-control {
+    margin-right: 0px !important;
     margin-top: 0px !important;
   }
 }
@@ -887,10 +1018,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   text-align: left;
 }
 
-.site-edit #content {
-  top: 30px;
-}
-
 #content.maximised {
   top: 0;
   left: 0;
@@ -2021,6 +2148,30 @@ a.button {
 /*
  * Rules for the iD editor
  */
+
+.site-edit-id {
+  #left,
+  #large-title {
+    display: none;
+  }
+
+  #small-title {
+    display: inline-block;
+    width: 185px;
+    height: 30px;
+    font-size: 14px;
+    margin: 0;
+    background-color: #eee;
+    border-bottom: 1px solid #ccc;
+    text-align: center;
+    padding-top: 7px;
+  }
+
+  #content {
+    left: 0;
+  }
+}
+
 .id-embed {
   width: 100%;
   height: 100%;