X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/33b7903c799c4f945e1b0e708587b70360cb0e74..452eabc941b9500d737956f698a88624fa86dc86:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index c4311ecb4..a73c8e86d 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -6,7 +6,7 @@ $offwhite: #f4f4ff;
 $blue: #7092FF;
 $lightblue: #B8C5F0;
 $grey: #AAA;
-$keyline: #CCC;
+$lightgrey: #CCC;
 $hovercolor: 20%;
 
 /* Styles common to large and small screens */
@@ -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;
-  }
 }
 
 /*
@@ -384,7 +384,7 @@ table {
     min-width: 0;
     text-indent: -1000px;
     overflow: hidden;
-    background: image-url("sprite.png") 0 0 no-repeat;
+    background: image-url("sprite.png") -2px -2px no-repeat;
     position: absolute;
     top: $lineheight/4;
     right: $lineheight/4;
@@ -448,6 +448,7 @@ a.donate {
 .site-index #top-bar,
 .site-export #top-bar {
   position: fixed;
+  top: 0;
   left: 0;
   right: 0;
 }
@@ -476,8 +477,7 @@ a.donate {
 
 .site-index #tabnav a#viewanchor,
 .site-edit #tabnav a#editanchor,
-.changeset-list #tabnav a#historyanchor,
-.site-export #tabnav a#exportanchor {
+.changeset-list #tabnav a#historyanchor {
   border-bottom: 1px solid #aaa;
   background: #9ed485;
   color: #000;
@@ -530,42 +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 */
@@ -602,11 +698,14 @@ a.donate {
   }
 }
 
-.layers-ui {
-  ul, li:last-child {
+.layers-ui,
+.share-ui {
+  ul, li:last-child, p:last-child {
     margin-bottom: 0;
   }
+}
 
+.layers-ui {
   li {
     border-radius: 4px;
     overflow: hidden;
@@ -634,18 +733,64 @@ 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;
-      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;
+  }
+
+  #mapnik_scale {
+    width: 100px;
+  }
 }
 
-.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;
   }
 }
@@ -677,7 +822,7 @@ a.donate {
   z-index: 10000;
   position: absolute;
   background-color: #ffffff;
-  border: 1px solid $keyline;
+  border: 1px solid $lightgrey;
   border-top: 0px;
   ul {
     margin: 0px;
@@ -710,9 +855,9 @@ a.donate {
   display: none;
   position: relative;
   float: left;
-  overflow: auto;
-  border-right: 1px solid $keyline;
+  border-right: 1px solid $lightgrey;
   width: 33.3333%;
+  height: 100%;
   ul {
     margin-bottom: 0;
     &:last-child {
@@ -750,6 +895,8 @@ a.donate {
 #sidebar_content {
   position: relative;
   margin-bottom: 20px;
+  overflow: auto;
+  height: 100%;
   width: 100%;
   h4 {
     padding: 0 $lineheight $lineheight/2 $lineheight;
@@ -839,7 +986,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .export_area_inputs {
   margin-bottom: $lineheight/2;
   input[type="text"] {
-    width: 60px;
+    width: 80px;
     margin-bottom: 5px;
   }
 }
@@ -848,20 +995,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   margin: $lineheight/4;
 }
 
-.export_details input[type="text"]#export_html_text {
-  width: 100%;
-}
-
-#sidebar #marker_inputs li:last-child {
-  margin-bottom: $lineheight/2;
-}
-
-#export_osm,
-#export_mapnik,
-#export_osmarender {
-  display: none;
-}
-
 /* Rules for the main content area */
 
 #content {
@@ -885,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;
@@ -1034,7 +1163,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   h4, p {
     margin-bottom: $lineheight/4;
   }
-  p, ul, .bbox, .geo {
+  ul, .bbox, .geo {
     display: inline-block;
     vertical-align: top;
     max-width: 65%;
@@ -1044,6 +1173,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     margin-bottom: 0;
   }
   h4 {
+    float: left;
     width: 33.3333%;
     display: inline-block;
     vertical-align: top;
@@ -1440,7 +1570,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   tr td {
     height: 30px;
-    border-right: 1px solid $keyline;
+    border-right: 1px solid $lightgrey;
   }
 }
 
@@ -1475,7 +1605,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .message-read .message-buttons {
   margin-top: $lineheight;
   padding-top: $lineheight;
-  border-top: 1px solid $keyline;
+  border-top: 1px solid $lightgrey;
 }
 
 .message-read .buttons .mark-unread-button {
@@ -1567,7 +1697,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   .form-divider {
     margin-top: $lineheight;
     padding-top: $lineheight;
-    border-top: 1px solid $keyline;
+    border-top: 1px solid $lightgrey;
   }
   .form-row {
     margin-bottom: $lineheight/2;
@@ -1608,7 +1738,6 @@ textarea {
 textarea {
   padding: 5px;
   width: 100%;
-  height: 100% !important;
 }
 
 /* Rules for user images */
@@ -1702,6 +1831,7 @@ a.button {
   display: inline-block;
   line-height: 20px;
   padding: $lineheight/4 $lineheight/2;
+  min-height: 20px + $lineheight/2;
   min-width: 120px;
   margin: 0 0 $lineheight/2 0;
   color: white;
@@ -1720,7 +1850,10 @@ a.button {
     }
   }
   &:disabled {
-    background: $lightblue;
+    background: $lightgrey;
+    &:hover {
+      background: $lightgrey;
+    }
   }
   &:last-child {
     margin-bottom: 0;
@@ -1738,8 +1871,11 @@ a.button {
     border-radius: 0;
     margin:0;
     min-width: 100px;
-    max-width: 150px;
+    max-width: 180px;
     border-right:1px solid white;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
   }
   input:first-child,
   .button:first-child {
@@ -1844,7 +1980,6 @@ a.button {
   }
 
   ul, ol {
-    font-style: italic;
     padding-left: $lineheight;
     margin-bottom: $lineheight;
     margin-left: $lineheight;
@@ -1971,7 +2106,6 @@ a.button {
     left: $lineheight/4;
     min-width: 15px;
     min-height: 15px;
-    background: image-url("sprite.png") 0 -45px no-repeat;
   }
 
   .permalink span {
@@ -2014,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%;