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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index fe78a45ab947e313e7fda4c5659e48f3d294baec..d598d10e3aa996bc198569d3c8bd37e810056ce5 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -37,8 +37,7 @@ time[title] {
   vertical-align: top;
   width: 20px;
   height: 20px;
   vertical-align: top;
   width: 20px;
   height: 20px;

-  background: transparent image-url("sprite.png") no-repeat 0 0;
-  background-image: image-url("sprite.svg");
+  background: transparent image-url("sprite.svg") no-repeat 0 0;

   text-indent: -9999px;
   overflow: hidden;
 }
   text-indent: -9999px;
   overflow: hidden;
 }


@@ -81,7 +80,9 @@ time[title] {
 
 #menu-icon {
   display: none;
 
 #menu-icon {
   display: none;

-  float: right;
+  position: absolute;
+  top: 0;
+  right: 0;

   background: image-url("menu-icon.png") no-repeat;
   background-size: 30px 30px;
   width: 30px;
   background: image-url("menu-icon.png") no-repeat;
   background-size: 30px 30px;
   width: 30px;


@@ -105,10 +106,6 @@ header {
     padding: $lineheight * 0.5;
   }
 
     padding: $lineheight * 0.5;
   }
 

-  h1, nav.primary {
-    float: left;
-  }
-

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


@@ -122,8 +119,11 @@ header {
   .btn {
     font-size: 14px;
   }
   .btn {
     font-size: 14px;
   }

-}

 
 

+  nav.primary {
+    margin-right: auto;
+  }
+}

 
 nav.primary {
   & > .btn-group .btn-outline-primary {
 
 nav.primary {
   & > .btn-group .btn-outline-primary {


@@ -158,9 +158,6 @@ nav.primary {
 }
 
 nav.secondary {
 }
 
 nav.secondary {

-  position: absolute;
-  right: 0;
-

   .nav-link {
     padding: 0.2rem;
     color: $darkgrey;
   .nav-link {
     padding: 0.2rem;
     color: $darkgrey;


@@ -202,15 +199,8 @@ body.small-nav {
     display: block;
   }
 
     display: block;
   }
 

-  nav.primary,
-  nav.secondary {
-    float: none !important;
-    position: relative;
-    display: block;
-    clear: both;
-  }
-

   header {
   header {

+    flex-direction: column;

     height: auto;
     min-height: $headerHeight;
     background: #fff;
     height: auto;
     min-height: $headerHeight;
     background: #fff;


@@ -231,28 +221,9 @@ body.small-nav {
   }
 
   nav.primary {
   }
 
   nav.primary {

+    margin-right: 0;

     padding: 0;
 
     padding: 0;
 

-    ul, li {
-      border: none;
-      border-radius: 0;
-      width: 100%;
-    }
-
-    ul {
-      border-top: 1px solid #eee;
-      li {
-        border-bottom: 1px solid #eee;
-        border-right: none;
-        > a {
-          border-radius: 0;
-          width: 100%;
-          text-align: center;
-          font-size: 15px;
-        }
-      }
-    }
-

     .btn-group {
       width: 100%;
       padding: 10px;
     .btn-group {
       width: 100%;
       padding: 10px;


@@ -591,16 +562,6 @@ header .search_forms,
   display: none;
 }
 
   display: none;
 }
 

-/* Rules for the map key which appears in the popout sidebar */
-
-#mapkey {
- .mapkey-table-key img {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-  }
-}
-

 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {
 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {


@@ -729,6 +690,12 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

+/* Force LTR/RTL alignment for placeholder text */
+
+.form-control::placeholder {
+  text-align: left;
+}
+

 /* Rules for export sidebar */
 
 .export_form {
 /* Rules for export sidebar */
 
 .export_form {


@@ -937,10 +904,9 @@ img.user_thumbnail {
 }
 
 img.user_thumbnail_tiny {
 }
 
 img.user_thumbnail_tiny {

-  width: auto;
-  height: auto;
-  max-width: 25px;
-  max-height: 25px;
+  width: 25px;
+  height: 25px;
+  object-fit: contain;

 }
 
 /* General styles for action lists / subnavs */
 }
 
 /* General styles for action lists / subnavs */