From 4f60eb6c77de5648f8bc527a806a82f8f66745a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 8 Aug 2014 12:31:32 +0200 Subject: [PATCH] FIX: banner on mobile --- app/assets/stylesheets/common/components/banner.css.scss | 2 -- app/assets/stylesheets/desktop.scss | 1 + app/assets/stylesheets/desktop/banner.scss | 8 ++++++++ app/assets/stylesheets/mobile.scss | 1 + app/assets/stylesheets/mobile/banner.scss | 7 +++++++ 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 app/assets/stylesheets/desktop/banner.scss create mode 100644 app/assets/stylesheets/mobile/banner.scss diff --git a/app/assets/stylesheets/common/components/banner.css.scss b/app/assets/stylesheets/common/components/banner.css.scss index 4803d05f098..ee93bbd4adf 100644 --- a/app/assets/stylesheets/common/components/banner.css.scss +++ b/app/assets/stylesheets/common/components/banner.css.scss @@ -3,12 +3,10 @@ // -------------------------------------------------- #banner { - margin-bottom: 10px; padding: 10px; border-radius: 5px; background: scale-color($tertiary, $lightness: 90%); @include box-shadow(0 1px 2px scale-color($tertiary, $lightness: 70%)); - max-width: 1090px; z-index: 501; &.overlay { diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss index 87b0c662a81..fa2cf8ed38c 100644 --- a/app/assets/stylesheets/desktop.scss +++ b/app/assets/stylesheets/desktop.scss @@ -3,6 +3,7 @@ /* @import "desktop/*"; TODO: get this working again */ @import "desktop/alert"; +@import "desktop/banner"; @import "desktop/compose"; @import "desktop/discourse"; @import "desktop/header"; diff --git a/app/assets/stylesheets/desktop/banner.scss b/app/assets/stylesheets/desktop/banner.scss new file mode 100644 index 00000000000..f4eca08078a --- /dev/null +++ b/app/assets/stylesheets/desktop/banner.scss @@ -0,0 +1,8 @@ +// -------------------------------------------------- +// Banner +// -------------------------------------------------- + +#banner { + margin-bottom: 10px; + width: 1090px; +} diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss index 3abcfc294ff..84549f2736d 100644 --- a/app/assets/stylesheets/mobile.scss +++ b/app/assets/stylesheets/mobile.scss @@ -3,6 +3,7 @@ /* @import "mobile/*"; TODO: get this working again */ @import "mobile/alert"; +@import "mobile/banner"; @import "mobile/compose"; @import "mobile/discourse"; @import "mobile/faqs"; diff --git a/app/assets/stylesheets/mobile/banner.scss b/app/assets/stylesheets/mobile/banner.scss new file mode 100644 index 00000000000..90001fedd39 --- /dev/null +++ b/app/assets/stylesheets/mobile/banner.scss @@ -0,0 +1,7 @@ +// -------------------------------------------------- +// Banner +// -------------------------------------------------- + +#banner { + margin: 10px; +}