Merge pull request #5151 from AntonKhorev/no-history-and-export-buttons

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c7b733f2605616d583dc0d98c77081e1a012a246..c4391be2d1f8084b1ec63573fd8934db2becefd8 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;
 }
 


@@ -72,6 +70,18 @@ time[title] {
   }
 }
 
   }
 }
 

+/* Utility for delayed loading spinner */
+
+.delayed-fade-in {
+  animation: 300ms linear forwards delayed-fade-in;
+}
+
+@keyframes delayed-fade-in {
+  0%   { opacity: 0 }
+  66%  { opacity: 0 }
+  100% { opacity: 1 }
+}
+

 /* Rules for the header */
 
 #menu-icon {
 /* Rules for the header */
 
 #menu-icon {


@@ -98,23 +108,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,10 +124,14 @@ header {
   nav.primary {
     margin-right: auto;
   }
   nav.primary {
     margin-right: auto;
   }

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

 }
 
 nav.primary {
 }
 
 nav.primary {

-  & > .btn-group .btn-outline-primary {
+  #edit_tab .btn-outline-primary {

     @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
   }
 
     @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
   }
 


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

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

   }
 }
 
   }
 }
 


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

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

     }
 
     .search_forms {
     }
 
     .search_forms {


@@ -205,9 +209,7 @@ body.small-nav {
     }
   }
 
     }
   }
 

-  #sidebar .search_forms,
-  #edit_tab,
-  #export_tab {
+  #sidebar .search_forms {

     display: none;
   }
 
     display: none;
   }
 


@@ -215,13 +217,15 @@ body.small-nav {
     margin-right: 0;
     padding: 0;
 
     margin-right: 0;
     padding: 0;
 

-    .btn-group {
+    #edit_tab {

       width: 100%;
       padding: 10px;
     }
   }
 
   nav.secondary {
       width: 100%;
       padding: 10px;
     }
   }
 
   nav.secondary {

+    flex-direction: column;
+

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


@@ -374,6 +378,14 @@ body.small-nav {
     .leaflet-marker-draggable {
       cursor: move;
     }
     .leaflet-marker-draggable {
       cursor: move;
     }

+
+    .query-marker {
+      animation: 1500ms forwards query-marker-fade;
+
+      @keyframes query-marker-fade {
+        to { opacity: 0 }
+      }
+    }

   }
 
   #map-ui {
   }
 
   #map-ui {


@@ -401,7 +413,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;


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

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

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


@@ -418,9 +430,12 @@ body.small-nav {
 
 .layers-ui {
   .base-layers > * {
 
 .layers-ui {
   .base-layers > * {

-    height: 56px;
+    height: 3.5rem;

 
     > .btn {
 
     > .btn {

+      box-sizing: content-box;
+      top: - map.get($border-widths, 4);
+      left: - map.get($border-widths, 4);

       --bs-btn-border-color: var(--bs-body-bg);
     }
     > .btn:hover {
       --bs-btn-border-color: var(--bs-body-bg);
     }
     > .btn:hover {


@@ -429,10 +444,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 +510,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 {


@@ -588,10 +589,12 @@ tr.turn {
     cursor: pointer;
 }
 
     cursor: pointer;
 }
 

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

 
 

-.browse_status {
-  display: none;
+  img {
+    cursor: move;
+  }

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


@@ -642,26 +645,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 {


@@ -710,10 +698,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;


@@ -722,16 +716,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");

   }
 }
 
   }
 }
 


@@ -891,53 +885,7 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

-/* Rules for the "Welcome" page */
-.site-welcome, .site-fixthemap {
-  .sprite {
-    background-image: image-url("welcome-sprite.svg");
-    background-size: 500px 250px;
-    display: block;
-  }
-
-  .sprite.small {
-    width: 50px;
-    height: 50px;
-  }
-
-  .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.way {
-    /*rtl:ignore*/ background-position: -150px 0;
-  }
-
-  .sprite.tag {
-    /*rtl:ignore*/ background-position: -200px 0;
-  }
-
-  .sprite.editor {
-    /*rtl:ignore*/ background-position: -250px 0;
-  }
-
-  .sprite.question {
-    /*rtl:ignore*/ background-position: -300px 0;
-  }
-
-  .sprite.rules {
-    /*rtl:ignore*/ background-position: -350px 0;
-  }
-}
+/* Rules for the "About" page */

 
 .site-about #content {
   .content-inner {
 
 .site-about #content {
   .content-inner {


@@ -972,41 +920,12 @@ div.secondary-actions {
       margin-left: -1em;
     }
   }
       margin-left: -1em;
     }
   }

-
-  .icon {
-    width: 30px;
-    height: 30px;
-    background: 40px 40px image-url('about/sprite.png') no-repeat;
-
-    &.local {
-      /*rtl:ignore*/
-      background-position: 0px 0px;
-    }
-    &.community {
-      /*rtl:ignore*/
-      background-position: 0px -40px;
-    }
-    &.open {
-      /*rtl:ignore*/
-      background-position: 0px -80px;
-    }
-    &.partners {
-      /*rtl:ignore*/
-      background-position: 0px -120px;
-    }
-    &.infringement {
-      /*rtl:ignore*/
-      background-position: 0px -160px;
-    }
-    &.legal {
-      /*rtl:ignore*/
-      background-position: -45px -160px;
-    }
-  }

 }
 
 }
 

-.auth-container {
-  max-width: 600px;
+/* Rules for block pages */
+
+#block_list .username {
+  max-width: 20em;

 }
 
 /* Rules for tabs inside secondary background sections */
 }
 
 /* Rules for tabs inside secondary background sections */