X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e96a64ca9c2ea068dd9167e074ee26c8d28744b4..a89d75d3d8824c2a4c2c3567083afc986c3b18a6:/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 1e3bcc468..c90aa9145 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 */
@@ -162,6 +162,7 @@ h6:first-child {
 .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; }
@@ -305,7 +306,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;
@@ -331,23 +332,6 @@ table {
     font-size: 12px;
     margin: 0;
   }
-
-  li:last-child h4 {
-    padding-top: 0;
-  }
-}
-
-/* Rules for SOTM advert */
-
-#sotm {
-  width: 165px;
-  margin: $lineheight/2;
-  padding: 0px;
-  border: 0px;
-  background: #fff;
-  img {
-    width: 165px;
-  }
 }
 
 /*
@@ -396,7 +380,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;
@@ -488,8 +472,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;
@@ -548,62 +531,86 @@ a.donate {
   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;
 }
 
 .leaflet-control .zoomin,
-.control-layers .control-button,
-.control-note .control-button {
+.control-layers .control-button {
   margin-bottom: 0px;
-  border-radius: 4px 4px 0px 0px;
+  border-radius: 4px 0 0 0;
 }
 
-.leaflet-control .zoomout {
-  margin-bottom: 0px;
-  border-radius: 0px;
+.site .leaflet-control .zoomout,
+.control-key .control-button {
+  margin-bottom: 0;
+  border-radius: 0;
 }
 
+.leaflet-control .zoomout, // For non-main page maps
 .control-locate .control-button,
-.control-key .control-button,
 .control-share .control-button {
-  border-radius: 0px 0px 4px 4px;
+  border-radius: 0 0 0 4px;
 }
 
 .leaflet-control .control-button:hover {
-  background-color: white;
+  background-color: black;
+}
+
+.leaflet-control .control-button.active {
+  background-color: #9ed485;
 }
 
 .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 {
-  position: absolute;
   display: none;
-  right: 0;
+  position: relative;
+  float: right;
   width: 250px;
   height: 100%;
   background: white;
+  border-left: 1px solid #CCC;
   overflow: auto;
-}
 
-#map-ui {
-  section {
-    border-top: 1px solid #868e85;
+  .section {
+    border-bottom: 1px solid #DDD;
     padding: 15px;
   }
 
-  section:first-child {
-    border-top:0;
+  a.close-button {
+    float: right;
+    padding:5px;
+    font-size:20px;
+    line-height:10px;
+    color:#222;
+    border:1px solid #ddd;
   }
+}
 
-  h2 {
-    margin:0;
+.layers-ui,
+.share-ui {
+  ul, li:last-child, p:last-child {
+    margin-bottom: 0;
   }
+}
 
+.layers-ui {
   li {
     border-radius: 4px;
     overflow: hidden;
@@ -612,13 +619,13 @@ a.donate {
 
   label {
     display: block;
-    padding: 5px;
-    background-color: #868e85;
+    padding: 5px 5px 5px 7px;
+    background-color: #eee;
     cursor: pointer;
   }
 
   li.active label {
-    background-color: #68c879;
+    background-color: #ccc;
   }
 
   .base-layers {
@@ -630,36 +637,68 @@ a.donate {
   }
 }
 
-.leaflet-control-attribution {
-  a.disabled {
-    color: #99c9dc;
-    cursor: default;
-    text-decoration: none;
+.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;
+    }
   }
 
-  ul.secondary-actions {
-    float: left;
-    margin-right: $lineheight/4;
+  .share-tab {
+    display: none;
+  }
 
-    &:only-child {
-      margin-right: 0px;
+  .share-link {
+    input[type=text],
+    textarea {
+      width: 100%;
+      font-family: monospace;
+      font-size: small;
     }
   }
+
+  .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;
   }
 }
 
-.site-index #map .olControlScaleLine,
-.site-export #map .olControlScaleLine {
-  left: $lineheight/2 !important;
-}
-
 .leaflet-popup-scrolled {
   padding-right: $lineheight;
   border-bottom: 0px !important;
@@ -687,7 +726,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;
@@ -718,23 +757,11 @@ a.donate {
 
 #sidebar {
   display: none;
-  position: absolute;
-  overflow: auto;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  border-right: 1px solid $keyline;
+  position: relative;
+  float: left;
+  border-right: 1px solid $lightgrey;
   width: 33.3333%;
-  .sidebar_heading {
-    position: relative;
-    padding: $lineheight/2 $lineheight;
-    z-index: 9999;
-    background: $offwhite;
-    border-bottom: 1px solid #ccc;
-  }
-  h4 {
-    margin: 0;
-  }
+  height: 100%;
   ul {
     margin-bottom: 0;
     &:last-child {
@@ -749,7 +776,18 @@ a.donate {
   }
 }
 
-#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;
@@ -761,6 +799,8 @@ a.donate {
 #sidebar_content {
   position: relative;
   margin-bottom: 20px;
+  overflow: auto;
+  height: 100%;
   width: 100%;
   h4 {
     padding: 0 $lineheight $lineheight/2 $lineheight;
@@ -850,7 +890,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;
   }
 }
@@ -859,20 +899,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 {
@@ -979,28 +1005,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 {
@@ -1067,7 +1071,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%;
@@ -1077,6 +1081,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;
@@ -1264,7 +1269,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;
@@ -1473,7 +1478,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   tr td {
     height: 30px;
-    border-right: 1px solid $keyline;
+    border-right: 1px solid $lightgrey;
   }
 }
 
@@ -1508,7 +1513,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 {
@@ -1600,7 +1605,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;
@@ -1641,7 +1646,6 @@ textarea {
 textarea {
   padding: 5px;
   width: 100%;
-  height: 100% !important;
 }
 
 /* Rules for user images */
@@ -1735,6 +1739,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;
@@ -1753,7 +1758,10 @@ a.button {
     }
   }
   &:disabled {
-    background: $lightblue;
+    background: $lightgrey;
+    &:hover {
+      background: $lightgrey;
+    }
   }
   &:last-child {
     margin-bottom: 0;
@@ -1771,8 +1779,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 {
@@ -1877,7 +1888,6 @@ a.button {
   }
 
   ul, ol {
-    font-style: italic;
     padding-left: $lineheight;
     margin-bottom: $lineheight;
     margin-left: $lineheight;
@@ -2004,7 +2014,6 @@ a.button {
     left: $lineheight/4;
     min-width: 15px;
     min-height: 15px;
-    background: image-url("sprite.png") 0 -45px no-repeat;
   }
 
   .permalink span {