Merge remote-tracking branch 'openstreetmap/pull/1036'

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 3afef70e30b82e4a110a4b8c76305cbbbd25fbcf..b2b6057bee6951fbf81f3963dbecec6094d7e528 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -173,6 +173,7 @@ small, aside {
 .icon.clipboard   { background-position: -160px 0; }
 .icon.link        { background-position: -180px 0; }
 .icon.close       { background-position: -200px 0; }
 .icon.clipboard   { background-position: -160px 0; }
 .icon.link        { background-position: -180px 0; }
 .icon.close       { background-position: -200px 0; }

+.close-wrap:hover .icon.close,

 .icon.close:hover { background-position: -200px -20px; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
 .icon.close:hover { background-position: -200px -20px; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }


@@ -546,6 +547,13 @@ body.compact {
     background: #fff;
     font-size: 12px;
 
     background: #fff;
     font-size: 12px;
 

+    > div {
+      position: relative;
+      float: left;
+      clear: both;
+      width: 100%;
+    }
+

     h2 {
       padding: $lineheight $lineheight $lineheight/2;
     }
     h2 {
       padding: $lineheight $lineheight $lineheight/2;
     }


@@ -556,9 +564,24 @@ body.compact {
       font-size: 13px;
     }
 
       font-size: 13px;
     }
 

+    .close-wrap {
+      cursor: pointer;
+      position: absolute;
+      top: 0;
+      right: 0;
+      width: 60px;
+      height: 60px;
+
+      .icon.close {
+        pointer-events: none;
+        position: absolute;
+        right: 20px;
+        top: 20px;
+      }
+    }
+

     .icon.close {
       float: right;
     .icon.close {
       float: right;

-      cursor: pointer;

     }
 
     p.error {
     }
 
     p.error {


@@ -568,25 +591,26 @@ body.compact {
     }
   }
 
     }
   }
 

-  .welcome {
-    display: none;
-  }
-

   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;

-    border-bottom-right-radius: 5px;

     overflow: hidden;
     overflow: hidden;

+
+    #banner,

     .welcome {
       display: block;
     }
     .welcome {
       display: block;
     }

+

     #sidebar_content {
       display: none;
     }
   }
 
   .welcome {
     #sidebar_content {
       display: none;
     }
   }
 
   .welcome {

+    display: none;
+    padding-bottom: 5px;
+

     p {
       padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;
     p {
       padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;


@@ -607,6 +631,15 @@ body.compact {
     }
   }
 
     }
   }
 

+  #banner {
+    display: none;
+
+    img {
+      display: block;
+      width: $sidebarWidth;
+    }
+  }
+

   #map {
     height: 100%;
     overflow: hidden;
   #map {
     height: 100%;
     overflow: hidden;


@@ -1003,8 +1036,8 @@ div.direction {
   height: 20px;
   background-repeat: no-repeat;
 }
   height: 20px;
   background-repeat: no-repeat;
 }

-@for $i from 1 through 18 {
-div.direction.i#{$i} { background-position: #{($i)*-20+20}px 0px; }
+@for $i from 0 through 25 {
+div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }

 }
 
 p#routing_summary {
 }
 
 p#routing_summary {


@@ -1335,6 +1368,11 @@ tr.turn:hover {
 .user-terms {
   .content-body .content-inner {
     padding: 0;
 .user-terms {
   .content-body .content-inner {
     padding: 0;

+
+    .message {
+      margin-top: 80px;
+      padding: 20px;
+    }

   }
 }
 
   }
 }
 


@@ -1588,10 +1626,6 @@ tr.turn:hover {
     float: left;
     display: block;
   }
     float: left;
     display: block;
   }

-
-  ul.secondary-actions {
-    display: inline-block;
-  }

 }
 
 .content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div
 }
 
 .content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div


@@ -1824,6 +1858,19 @@ tr.turn:hover {
     display: inline-block;
     margin-left: $lineheight / 2;
     vertical-align: middle;
     display: inline-block;
     margin-left: $lineheight / 2;
     vertical-align: middle;

+
+    p {
+      margin-top: $lineheight * 0.5;
+      margin-bottom: $lineheight * 0.5;
+
+      &:first-child {
+        margin-top: 0px;
+      }
+
+      &:last-child {
+        margin-bottom: 0px;
+      }
+    }

   }
 }
 
   }
 }