From 707bca8a72d417f65799e24e9949905f41b2875e Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 26 May 2020 08:56:11 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20brand=20and=20nav=20sho?= =?UTF-8?q?uld=20collapse=20when=20no=20items=20present?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rose/addon/styles/rose/components/header/_brand.scss | 4 ++-- .../addon/styles/rose/components/header/nav/_index.scss | 8 +++----- .../addon/styles/rose/components/header/nav/_link.scss | 5 +++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/addons/rose/addon/styles/rose/components/header/_brand.scss b/addons/rose/addon/styles/rose/components/header/_brand.scss index 463cbb639..671e38ffc 100644 --- a/addons/rose/addon/styles/rose/components/header/_brand.scss +++ b/addons/rose/addon/styles/rose/components/header/_brand.scss @@ -7,8 +7,8 @@ align-items: center; color: var(--white); text-decoration: none; - padding: 10px; - margin: 0 10px; + padding: 0 10px; + margin: 10px; svg { // 28px... header sizes do not follow the sizing system diff --git a/addons/rose/addon/styles/rose/components/header/nav/_index.scss b/addons/rose/addon/styles/rose/components/header/nav/_index.scss index 3605a62a2..e950cb452 100644 --- a/addons/rose/addon/styles/rose/components/header/nav/_index.scss +++ b/addons/rose/addon/styles/rose/components/header/nav/_index.scss @@ -1,3 +1,4 @@ +@use '../../../variables/sizing'; @use '../../../variables/media'; @import 'link'; @@ -7,12 +8,9 @@ display: flex; flex-wrap: wrap; align-items: center; - padding: 10px 0; -} -@media (max-width: media.width(small)) { - .rose-header-nav { - padding: 10px 20px; + @media (max-width: media.width(small)) { + padding: 0 20px; background: var(--ui-header-subtler); } } diff --git a/addons/rose/addon/styles/rose/components/header/nav/_link.scss b/addons/rose/addon/styles/rose/components/header/nav/_link.scss index cbea143c3..8a143fcd2 100644 --- a/addons/rose/addon/styles/rose/components/header/nav/_link.scss +++ b/addons/rose/addon/styles/rose/components/header/nav/_link.scss @@ -10,11 +10,12 @@ text-decoration: none; color: var(--white); - opacity: 0.5; + opacity: 0.75; // again, nonstandard sizing for header stuff + margin: 10px 0; padding: 6px 12px; - border-radius: 4px; + border-radius: sizing.rems(xxs); &.active { opacity: 1;