Fix print CSS (fixes #379)

[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 4ce15ec451246e52810eb92a0c9ecc980de14c45..1807856b4ba77becca2c060f808d898f08223e40 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -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; }
 .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; }
 .icon.layers      { background-position: -100px 0; }
 .icon.key         { background-position: -120px 0; }
 .icon.share       { background-position: -140px 0; }


@@ -337,19 +338,6 @@ table {
   }
 }
 
   }
 }
 

-/* Rules for SOTM advert */
-
-#sotm {
-  width: 165px;
-  margin: $lineheight/2;
-  padding: 0px;
-  border: 0px;
-  background: #fff;
-  img {
-    width: 165px;
-  }
-}
-

 /*
  * Rules for "optional boxes" which appear in the left sidebar on
  * certain pages. Current users are the seach box on the main page
 /*
  * Rules for "optional boxes" which appear in the left sidebar on
  * certain pages. Current users are the seach box on the main page


@@ -552,22 +540,23 @@ a.donate {
   background-color: rgba(255,255,255,.8);
   border-radius: 4px;
   margin-bottom: 10px;
   background-color: rgba(255,255,255,.8);
   border-radius: 4px;
   margin-bottom: 10px;

+  outline: none;

 }
 
 .leaflet-control .zoomin,
 }
 
 .leaflet-control .zoomin,

-.control-layers .control-button,
-.control-note .control-button {
+.control-layers .control-button {

   margin-bottom: 0px;
   border-radius: 4px 4px 0px 0px;
 }
 
   margin-bottom: 0px;
   border-radius: 4px 4px 0px 0px;
 }
 

-.leaflet-control .zoomout {
+.site .leaflet-control .zoomout,
+.control-key .control-button {

   margin-bottom: 0px;
   border-radius: 0px;
 }
 
   margin-bottom: 0px;
   border-radius: 0px;
 }
 

+.leaflet-control .zoomout,

 .control-locate .control-button,
 .control-locate .control-button,

-.control-key .control-button,

 .control-share .control-button {
   border-radius: 0px 0px 4px 4px;
 }
 .control-share .control-button {
   border-radius: 0px 0px 4px 4px;
 }


@@ -580,28 +569,43 @@ a.donate {
   margin: 10px;
 }
 
   margin: 10px;
 }
 

+/* Rules for the home page */
+
+.site-export #map,
+.site-index #map,
+.site-edit #map {
+  height: 100%;
+  overflow: hidden;
+}
+

 #map-ui {
 #map-ui {

-  position: absolute;

   display: none;
   display: none;

-  right: 0;
+  position: relative;
+  float: right;

   width: 250px;
   height: 100%;
   background: white;
   width: 250px;
   height: 100%;
   background: white;

+  border-left: 1px solid #CCC;

   overflow: auto;
   overflow: auto;

-}

 
 

-#map-ui {
-  section {
-    border-top: 1px solid #868e85;
+  .section {
+    border-bottom: 1px solid #DDD;

     padding: 15px;
   }
 
     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 {
+  ul, li:last-child {
+    margin-bottom: 0;

   }
 
   li {
   }
 
   li {


@@ -612,7 +616,7 @@ a.donate {
 
   label {
     display: block;
 
   label {
     display: block;

-    padding: 5px;
+    padding: 5px 5px 5px 7px;

     background-color: #eee;
     cursor: pointer;
   }
     background-color: #eee;
     cursor: pointer;
   }


@@ -621,10 +625,6 @@ a.donate {
     background-color: #ccc;
   }
 
     background-color: #ccc;
   }
 

-  input[type=text] {
-    width:220px;
-  }
-

   .base-layers {
     .leaflet-container {
       width: 100%;
   .base-layers {
     .leaflet-container {
       width: 100%;


@@ -634,19 +634,11 @@ a.donate {
   }
 }
 
   }
 }
 

-.leaflet-control-attribution {
-  a.disabled {
-    color: #99c9dc;
-    cursor: default;
-    text-decoration: none;
-  }
-
-  ul.secondary-actions {
-    float: left;
-    margin-right: $lineheight/4;
-
-    &:only-child {
-      margin-right: 0px;
+.share-ui {
+  .share-link {
+    li {
+      display: inline-block;
+      width: 50%;

     }
   }
 }
     }
   }
 }


@@ -659,11 +651,6 @@ a.donate {
   }
 }
 
   }
 }
 

-.site-index #map .olControlScaleLine,
-.site-export #map .olControlScaleLine {
-  left: $lineheight/2 !important;
-}
-

 .leaflet-popup-scrolled {
   padding-right: $lineheight;
   border-bottom: 0px !important;
 .leaflet-popup-scrolled {
   padding-right: $lineheight;
   border-bottom: 0px !important;


@@ -722,23 +709,12 @@ a.donate {
 
 #sidebar {
   display: none;
 
 #sidebar {
   display: none;

-  position: absolute;
+  position: relative;
+  float: left;

   overflow: auto;
   overflow: auto;

-  top: 0px;
-  bottom: 0px;
-  left: 0px;

   border-right: 1px solid $keyline;
   width: 33.3333%;
   border-right: 1px solid $keyline;
   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 {
   ul {
     margin-bottom: 0;
     &:last-child {


@@ -753,7 +729,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;
   position: absolute;
   height: $lineheight;
   top: 0px;


@@ -854,7 +841,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .export_area_inputs {
   margin-bottom: $lineheight/2;
   input[type="text"] {
 .export_area_inputs {
   margin-bottom: $lineheight/2;
   input[type="text"] {

-    width: 60px;
+    width: 80px;

     margin-bottom: 5px;
   }
 }
     margin-bottom: 5px;
   }
 }


@@ -983,28 +970,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   margin-bottom: $lineheight;
 }
 
   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 {
 /* Rules for the changeset list shown by the history tab etc */
 
 #changeset_list {


@@ -1071,7 +1036,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   h4, p {
     margin-bottom: $lineheight/4;
   }
   h4, p {
     margin-bottom: $lineheight/4;
   }

-  p, ul, .bbox, .geo {
+  ul, .bbox, .geo {

     display: inline-block;
     vertical-align: top;
     max-width: 65%;
     display: inline-block;
     vertical-align: top;
     max-width: 65%;


@@ -1081,6 +1046,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     margin-bottom: 0;
   }
   h4 {
     margin-bottom: 0;
   }
   h4 {

+    float: left;

     width: 33.3333%;
     display: inline-block;
     vertical-align: top;
     width: 33.3333%;
     display: inline-block;
     vertical-align: top;


@@ -1268,7 +1234,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   h1, h2 {
     font-size: 21px;
   }
   h1, h2 {
     font-size: 21px;

-    line-height: 1;
+    line-height: 1em;

   }
   small.deemphasize {
     float: left;
   }
   small.deemphasize {
     float: left;