Merge remote-tracking branch 'upstream/pull/4929'

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 757da56fec30f495a332f758b87eb6ebfb5c1cf7..a1734682e159e2c3040ca67fee5b828c864331cd 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -395,7 +395,7 @@ body.small-nav {
       overflow-y: scroll;
     }
 
       overflow-y: scroll;
     }
 

-    .overlay-sidebar {
+    .overlay-sidebar.overlay-right-sidebar {

       #sidebar {
         position: absolute;
         width: 350px;
       #sidebar {
         position: absolute;
         width: 350px;


@@ -403,7 +403,7 @@ body.small-nav {
         overflow: hidden;
       }
 
         overflow: hidden;
       }
 

-      #map, #map-ui {
+      #map {

         height: 100%;
       }
     }
         height: 100%;
       }
     }


@@ -568,7 +568,13 @@ tr.turn {
     cursor: pointer;
 }
 
     cursor: pointer;
 }
 

-.routing_marker { width: 15px; cursor: move; }
+.routing_marker_column {
+  width: 15px;
+
+  img {
+    cursor: move;
+  }
+}

 
 /* Rules for the history sidebar */
 
 
 /* Rules for the history sidebar */
 


@@ -671,10 +677,16 @@ tr.turn {
   padding: $lineheight;
 }
 
   padding: $lineheight;
 }
 

-/* Overrides for pages that use new layout conventions */
+/* Rules for login and signup pages */
+
+.sessions-new, .users-new, .users-create {
+  #content .content-inner {
+    max-width: 760px;
+  }
+}

 
 .header-illustration {
 
 .header-illustration {

-  background-position: 0 0;
+  background-position: right;

   background-repeat: no-repeat;
   position: relative;
   min-height: 200px;
   background-repeat: no-repeat;
   position: relative;
   min-height: 200px;


@@ -683,16 +695,16 @@ tr.turn {
   bottom: 0;
 
   &.new-user-main {
   bottom: 0;
 
   &.new-user-main {

-    background-image: image-url("sign-up-illustration.png");
-    background-position-x: 50px;
+    background-image: image-url("sign-up-illustration.svg");
+    background-position-x: 70px;

   }
 
   &.confirm-main {
   }
 
   &.confirm-main {

-    background-image: image-url("confirm-illustration.png");
+    background-image: image-url("confirm-illustration.svg");

   }
 
   &.new-user-terms {
   }
 
   &.new-user-terms {

-    background-image: image-url("terms-illustration.png");
+    background-image: image-url("terms-illustration.svg");

   }
 }
 
   }
 }
 


@@ -889,10 +901,6 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

-.auth-container {
-  max-width: 600px;
-}
-

 /* Rules for tabs inside secondary background sections */
 
 .bg-body-secondary .nav-tabs {
 /* Rules for tabs inside secondary background sections */
 
 .bg-body-secondary .nav-tabs {