Merge remote-tracking branch 'osmlab/map-ui'

[rails.git] / app / assets / stylesheets / common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 4afc71533a42304d3a3c3f6f129f82ab7dafb5c7..18983242f30e4f5ce85440eb76e639b090879f7b 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -540,6 +540,7 @@ a.donate {
   background-color: rgba(255,255,255,.8);
   border-radius: 4px;
   margin-bottom: 10px;
+  outline: none;
 }
 
 .leaflet-control .zoomin,
@@ -568,19 +569,26 @@ a.donate {
   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 {
+  .section {
     border-bottom: 1px solid #DDD;
     padding: 15px;
   }
@@ -593,6 +601,12 @@ a.donate {
     color:#222;
     border:1px solid #ddd;
   }
+}
+
+.layers-ui {
+  ul, li:last-child {
+    margin-bottom: 0;
+  }
 
   li {
     border-radius: 4px;
@@ -602,7 +616,7 @@ a.donate {
 
   label {
     display: block;
-    padding: 5px;
+    padding: 5px 5px 5px 7px;
     background-color: #eee;
     cursor: pointer;
   }
@@ -611,10 +625,6 @@ a.donate {
     background-color: #ccc;
   }
 
-  input[type=text] {
-    width:220px;
-  }
-
   .base-layers {
     .leaflet-container {
       width: 100%;
@@ -624,6 +634,15 @@ a.donate {
   }
 }
 
+.share-ui {
+  .share-link {
+    li {
+      display: inline-block;
+      width: 50%;
+    }
+  }
+}
+
 .site-index .leaflet-top,
 .site-export .leaflet-top {
   top: $lineheight/2 !important;
@@ -690,11 +709,9 @@ a.donate {
 
 #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%;
   ul {
@@ -952,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 {
@@ -1040,7 +1035,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%;
@@ -1050,6 +1045,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;