Merge pull request #6873 from hallaathrad/fix/flash-message-positioning

Fix for flash message not displaying in detached map

client/less/main.less

@@ -974,8 +974,6 @@ code {
 
 @media only screen and (min-width: 993px) {
   .iframe-scroll {
-    position: fixed !important;
-    margin-top: 75px;
     z-index: 1;
   }
 }

client/less/map.less

@@ -87,6 +87,13 @@
       margin:25px 0;
     }
   }
+  .flashMessage {
+    position:fixed;
+    margin: 0 auto;
+    z-index: 2;
+    top: 160px;
+    width: 100%;
+  }
  }
 
 .map-buttons {

client/main.js

@@ -340,6 +340,7 @@ $(document).ready(function() {
   }
 
   if (String(window.location).match(/\/map$/ig)) {
+    $('body>.flashMessage').find('.alert').css('display', 'none');
     $('.map-fixed-header').css('top', '50px');
   }
 

server/views/map/show.jade

@@ -10,6 +10,7 @@ block content
                     span.input-group-addon
                        i.fa.fa-search
             hr
+            include ../partials/flash
         #accordion.map-accordion
           #noneFound No results found. Happy Coding!
           for superBlock, index in superBlocks

server/views/partials/flash.jade

@@ -1,4 +1,4 @@
-.row
+.row.flashMessage
     .col-xs-12
         if (messages.errors || messages.error)
           .alert.alert-danger.fade.in