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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c7b733f2605616d583dc0d98c77081e1a012a246..edef1444b85b00a924d1ad554edef97cf832c059 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -16,8 +16,6 @@ time[title] {
   text-decoration: underline dotted;
 }
 
   text-decoration: underline dotted;
 }
 

-#container { position: relative; }
-

 /* Rules for icons */
 
 .icon {
 /* Rules for icons */
 
 .icon {


@@ -50,7 +48,7 @@ time[title] {
 
 /* Utility for de-emphasizing content */
 
 
 /* Utility for de-emphasizing content */
 

-.text-muted a {
+.text-body-secondary a {

   color: $blue;
 }
 
   color: $blue;
 }
 


@@ -98,23 +96,13 @@ header {
   position: relative;
   font-size: 14px;
 
   position: relative;
   font-size: 14px;
 

-  h1, nav, nav > ul, nav > ul > li {
-    display: inline-block;
-  }
-

   > * {
   > * {

-    height: 100%;

     padding: $lineheight * 0.5;
   }
 
     padding: $lineheight * 0.5;
   }
 

-  img.logo {
-    margin-top: -2px;
-  }
-

   h1 {
   h1 {

+    height: $headerHeight;

     font-size: 18px;
     font-size: 18px;

-    line-height: 1.2;
-    padding-top: 15px;

   }
 
   .btn {
   }
 
   .btn {


@@ -124,6 +112,10 @@ header {
   nav.primary {
     margin-right: auto;
   }
   nav.primary {
     margin-right: auto;
   }

+
+  .username {
+    max-width: 12em;
+  }

 }
 
 nav.primary {
 }
 
 nav.primary {


@@ -160,7 +152,7 @@ nav.primary {
 
 nav.secondary {
   .nav-link {
 
 nav.secondary {
   .nav-link {

-    padding: 0.2rem;
+    padding: 0.3rem;

   }
 }
 
   }
 }
 


@@ -197,7 +189,7 @@ body.small-nav {
     min-height: $headerHeight;
 
     &.closed nav {
     min-height: $headerHeight;
 
     &.closed nav {

-      display: none;
+      display: none !important;

     }
 
     .search_forms {
     }
 
     .search_forms {


@@ -222,6 +214,8 @@ body.small-nav {
   }
 
   nav.secondary {
   }
 
   nav.secondary {

+    flex-direction: column;
+

     .user-menu, .login-menu {
       width: 100%;
     }
     .user-menu, .login-menu {
       width: 100%;
     }


@@ -429,10 +423,6 @@ body.small-nav {
   }
 
   .overlay-layers {
   }
 
   .overlay-layers {

-    p {
-      font-size: 13px;
-      margin-bottom: 8px;
-    }

     li.disabled { color: $darkgrey; }
   }
 }
     li.disabled { color: $darkgrey; }
   }
 }


@@ -499,16 +489,6 @@ body.small-nav {
 
 .donate-attr { color: darken($green, 10%) !important; }
 
 
 .donate-attr { color: darken($green, 10%) !important; }
 

-/* Rules for the sidebar */
-
-#browse_status {
-  input {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-  }
-}
-

 /* Temporary label size override until we remove site-wide font customisation */
 
 form {
 /* Temporary label size override until we remove site-wide font customisation */
 
 form {


@@ -590,10 +570,6 @@ tr.turn {
 
 .routing_marker { width: 15px; cursor: move; }
 
 
 .routing_marker { width: 15px; cursor: move; }
 

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

 /* Rules for the history sidebar */
 
 #sidebar .changesets {
 /* Rules for the history sidebar */
 
 #sidebar .changesets {


@@ -642,26 +618,11 @@ tr.turn {
     }
   }
 
     }
   }
 

-  .note-description {
-    overflow: hidden;
-    margin: 0 0 10px 10px;
-  }
-

   .query-results {
     display: none;
   }
 }
 
   .query-results {
     display: none;
   }
 }
 

-/* Bootstrap buttons don't have any vertical margin, so
-   they touch when adjacent buttons wrap onto a new line
-   e.g. wide form buttons on a narrow sidebar */
-
-.btn-wrapper {
-  > .btn {
-    margin-bottom: $spacer * 0.25;
-  }
-}
-

 /* Force LTR/RTL alignment for placeholder text */
 
 .form-control::placeholder {
 /* Force LTR/RTL alignment for placeholder text */
 
 .form-control::placeholder {


@@ -891,29 +852,20 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

-/* Rules for the "Welcome" page */
+/* Rules for the "Welcome" and "Fix the map" pages */
+

 .site-welcome, .site-fixthemap {
   .sprite {
 .site-welcome, .site-fixthemap {
   .sprite {

-    background-image: image-url("welcome-sprite.svg");
-    background-size: 500px 250px;
-    display: block;
-  }
-
-  .sprite.small {

     width: 50px;
     height: 50px;
     width: 50px;
     height: 50px;

+    background-image: image-url("welcome-sprite.svg");
+    background-size: 500px 250px;

   }
 
   .sprite.x {
     /*rtl:ignore*/ background-position: -50px 0;
   }
 
   }
 
   .sprite.x {
     /*rtl:ignore*/ background-position: -50px 0;
   }
 

-  .sprite.term {
-    margin-right: 10px;
-    vertical-align: middle;
-    display: inline-block;
-  }
-

   .sprite.node {
     /*rtl:ignore*/ background-position: -100px 0;
   }
   .sprite.node {
     /*rtl:ignore*/ background-position: -100px 0;
   }


@@ -939,6 +891,8 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

+/* Rules for the "About" page */
+

 .site-about #content {
   .content-inner {
     max-width: 760px;
 .site-about #content {
   .content-inner {
     max-width: 760px;