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

app/assets/stylesheets/common.scss

@@ -242,6 +242,95 @@ body.compact-nav {
   }
 }
 
+body.small-nav {
+  #menu-icon {
+    display: inline-block !important;
+  }
+
+  nav.primary,
+  nav.secondary {
+    float: none !important;
+    position: relative;
+    display: block;
+    clear: both;
+  }
+
+  header {
+    height: auto;
+    min-height: $headerHeight;
+    background: #fff;
+
+    &.closed nav {
+      display: none;
+    }
+
+    .search_forms {
+      display: block;
+    }
+  }
+
+  #sidebar .search_forms,
+  #edit_tab,
+  #export_tab {
+    display: none;
+  }
+
+  nav.primary {
+    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;
+    }
+  }
+
+  nav.secondary {
+    .user-menu {
+      width: 100%;
+    }
+  }
+
+  #compact-secondary-nav {
+    display: none;
+  }
+
+  .compact-hide {
+    display: inline-block;
+  }
+
+  .overlay-sidebar #sidebar .welcome.visible {
+    display: none;
+  }
+
+  .overlay-sidebar #sidebar #banner {
+    display: none;
+  }
+
+  .leaflet-top.leaflet-right {
+    top: 10px !important;
+  }
+}
+
 /* Utility for styling notification numbers */
 
 .count-number {
@@ -441,6 +530,36 @@ body.compact-nav {
   }
 }
 
+@include media-breakpoint-down(md) {
+  body.map-layout {
+    #sidebar, #map {
+      position: relative;
+      overflow-x: hidden;
+      width: 100%;
+      height: 50%;
+    }
+
+    .overlay-sidebar {
+      #sidebar {
+        position: absolute;
+        width: 350px;
+        height: auto;
+        overflow: hidden;
+      }
+
+      #map {
+        height: 100%;
+      }
+    }
+
+    #map-ui {
+      z-index: 9999;
+      width: 100%;
+      overflow-y: scroll;
+    }
+  }
+}
+
 .layers-ui,
 .share-ui {
   li:last-child {
@@ -1600,9 +1719,3 @@ dl.dl-inline {
 }
 
 @import 'browse';
-
-@media only screen and (max-width:960px) {
-  .header-illustration.new-user-arm {
-    display: none;
-  }
-}

app/assets/stylesheets/screen-ltr.css

@@ -1,4 +1,3 @@
 /*
  *= require ltr/common
- *= require ltr/small
  */

app/assets/stylesheets/screen-rtl.css

@@ -1,4 +1,3 @@
 /*
  *= require rtl/common
- *= require rtl/small
  */

app/assets/stylesheets/small.scss

@@ -1,122 +0,0 @@
-@import "parameters";
-
-/* Styles specific to a small screen, such as iPhone, Android, etc... */
-
-body.small-nav {
-  #menu-icon {
-    display: inline-block !important;
-  }
-
-  nav.primary,
-  nav.secondary {
-    float: none !important;
-    position: relative;
-    display: block;
-    clear: both;
-  }
-
-  header {
-    height: auto;
-    min-height: $headerHeight;
-    background: #fff;
-
-    &.closed nav {
-      display: none;
-    }
-
-    .search_forms {
-      display: block;
-    }
-  }
-
-  #sidebar .search_forms,
-  #edit_tab,
-  #export_tab {
-    display: none;
-  }
-
-  nav.primary {
-    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;
-    }
-  }
-
-  nav.secondary {
-    .user-menu {
-      width: 100%;
-    }
-  }
-
-  #compact-secondary-nav {
-    display: none;
-  }
-
-  .compact-hide {
-    display: inline-block;
-  }
-
-  .overlay-sidebar #sidebar .welcome.visible {
-    display: none;
-  }
-
-  .overlay-sidebar #sidebar #banner {
-    display: none;
-  }
-
-  .leaflet-top.leaflet-right {
-    top: 10px !important;
-  }
-}
-
-@media (max-width: 767.98px) {
-  body.map-layout {
-    #sidebar, #map {
-      position: relative;
-      overflow-x: hidden;
-      width: 100%;
-      height: 50%;
-    }
-
-    .overlay-sidebar {
-      #sidebar {
-        position: absolute;
-        width: 350px;
-        height: auto;
-        overflow: hidden;
-      }
-
-      #map {
-        height: 100%;
-      }
-    }
-
-    #map-ui {
-      z-index: 9999;
-      width: 100%;
-      overflow-y: scroll;
-    }
-  }
-}

app/views/users/new.html.erb

@@ -7,7 +7,7 @@
   <div class='header-illustration new-user-main'>
     <h1><%= t ".title" %></h1>
   </div>
-  <div class='header-illustration new-user-arm'></div>
+  <div class='header-illustration new-user-arm d-none d-md-block'></div>
 <% end %>
 
 <div class="row">