From ceed48f3211c1bc79e007cd23916d2c7b53f6342 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 22 Nov 2021 19:43:45 +0100 Subject: [PATCH] UX: Make banner full-width (#15038) --- app/assets/stylesheets/common/components/banner.scss | 1 + app/assets/stylesheets/desktop/_index.scss | 1 - app/assets/stylesheets/desktop/banner.scss | 8 -------- app/assets/stylesheets/mobile/_index.scss | 1 - app/assets/stylesheets/mobile/components/_index.scss | 1 + .../stylesheets/mobile/{ => components}/banner.scss | 0 6 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 app/assets/stylesheets/desktop/banner.scss rename app/assets/stylesheets/mobile/{ => components}/banner.scss (100%) diff --git a/app/assets/stylesheets/common/components/banner.scss b/app/assets/stylesheets/common/components/banner.scss index 22ec02c63d4..fc47c4ee456 100644 --- a/app/assets/stylesheets/common/components/banner.scss +++ b/app/assets/stylesheets/common/components/banner.scss @@ -8,6 +8,7 @@ color: var(--primary); z-index: z("base") + 1; margin-bottom: 1em; + max-height: 250px; overflow: auto; &.overlay { diff --git a/app/assets/stylesheets/desktop/_index.scss b/app/assets/stylesheets/desktop/_index.scss index 4e34333d839..499f8f4a219 100644 --- a/app/assets/stylesheets/desktop/_index.scss +++ b/app/assets/stylesheets/desktop/_index.scss @@ -1,5 +1,4 @@ @import "admin_customize"; -@import "banner"; @import "category-list"; @import "compose"; @import "discourse"; diff --git a/app/assets/stylesheets/desktop/banner.scss b/app/assets/stylesheets/desktop/banner.scss deleted file mode 100644 index 933d266a2be..00000000000 --- a/app/assets/stylesheets/desktop/banner.scss +++ /dev/null @@ -1,8 +0,0 @@ -// -------------------------------------------------- -// Banner -// -------------------------------------------------- - -#banner { - max-width: 1090px; - max-height: 250px; -} diff --git a/app/assets/stylesheets/mobile/_index.scss b/app/assets/stylesheets/mobile/_index.scss index 02c43e35286..b1cca1189df 100644 --- a/app/assets/stylesheets/mobile/_index.scss +++ b/app/assets/stylesheets/mobile/_index.scss @@ -5,7 +5,6 @@ @import "admin_report"; @import "admin_reports"; @import "alert"; -@import "banner"; @import "buttons"; @import "compose"; @import "dashboard"; diff --git a/app/assets/stylesheets/mobile/components/_index.scss b/app/assets/stylesheets/mobile/components/_index.scss index 89eb683655c..5f1e9142564 100644 --- a/app/assets/stylesheets/mobile/components/_index.scss +++ b/app/assets/stylesheets/mobile/components/_index.scss @@ -1,3 +1,4 @@ +@import "banner"; @import "topic-footer-mobile-dropdown"; @import "user-card"; @import "user-stream-item"; diff --git a/app/assets/stylesheets/mobile/banner.scss b/app/assets/stylesheets/mobile/components/banner.scss similarity index 100% rename from app/assets/stylesheets/mobile/banner.scss rename to app/assets/stylesheets/mobile/components/banner.scss