From eef47a26d9ea6db10a646771b094a9f534511c85 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 20 May 2020 17:17:47 -0400
Subject: [PATCH] UX: More consistent mobile banner/alert styles, css cleanup

---
 app/assets/stylesheets/common/base/alert.scss | 1 +
 app/assets/stylesheets/desktop.scss           | 1 -
 app/assets/stylesheets/desktop/alert.scss     | 3 ---
 app/assets/stylesheets/mobile/alert.scss      | 5 +++--
 app/assets/stylesheets/mobile/banner.scss     | 7 +------
 5 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 app/assets/stylesheets/desktop/alert.scss

diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index d729cdc7423..05a29029059 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -3,6 +3,7 @@
   background-color: $danger-low;
   color: $primary;
   position: relative;
+  margin-bottom: 1em;
 
   .close {
     font-size: $font-up-3;
diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss
index 70229afbbc1..064cd7174a7 100644
--- a/app/assets/stylesheets/desktop.scss
+++ b/app/assets/stylesheets/desktop.scss
@@ -2,7 +2,6 @@
 
 /* @import "desktop/*"; TODO: get this working again */
 
-@import "desktop/alert";
 @import "desktop/banner";
 @import "desktop/compose";
 @import "desktop/discourse";
diff --git a/app/assets/stylesheets/desktop/alert.scss b/app/assets/stylesheets/desktop/alert.scss
deleted file mode 100644
index f3f57eac668..00000000000
--- a/app/assets/stylesheets/desktop/alert.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.alert {
-  margin-bottom: 1em;
-}
diff --git a/app/assets/stylesheets/mobile/alert.scss b/app/assets/stylesheets/mobile/alert.scss
index 0ee9b44ee0e..12e60245e57 100644
--- a/app/assets/stylesheets/mobile/alert.scss
+++ b/app/assets/stylesheets/mobile/alert.scss
@@ -1,7 +1,8 @@
-// there are (n) new or updated topics, click to show
 .alert.alert-info {
-  margin: 0;
+  margin-bottom: 0.5em;
   &.clickable {
+    // there are (n) new or updated topics, click to show
+    margin-bottom: 0;
     padding: 1em;
   }
 }
diff --git a/app/assets/stylesheets/mobile/banner.scss b/app/assets/stylesheets/mobile/banner.scss
index 852b2847364..fc308f05880 100644
--- a/app/assets/stylesheets/mobile/banner.scss
+++ b/app/assets/stylesheets/mobile/banner.scss
@@ -3,11 +3,6 @@
 // --------------------------------------------------
 
 #banner {
-  // go full width on mobile, by extending into the 10px wrap
-  // borders on left and right
-  margin: 0 -10px;
   max-height: 180px;
-  @media all and (max-height: 499px) {
-    max-height: 100px;
-  }
+  height: 20vh;
 }