From 63e426c4a453e31d2e544172e00065cca5babaf7 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 26 May 2020 09:04:20 -0400 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20reorganize=20header?= =?UTF-8?q?=20nav=20style=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rose/components/header/_catchall.scss | 54 ------------------- .../styles/rose/components/header/_index.scss | 1 + .../components/header/{nav => }/_link.scss | 4 +- .../header/{nav/_index.scss => _nav.scss} | 6 +-- 4 files changed, 5 insertions(+), 60 deletions(-) rename addons/rose/addon/styles/rose/components/header/{nav => }/_link.scss (88%) rename addons/rose/addon/styles/rose/components/header/{nav/_index.scss => _nav.scss} (71%) diff --git a/addons/rose/addon/styles/rose/components/header/_catchall.scss b/addons/rose/addon/styles/rose/components/header/_catchall.scss index bac73fba3..f7355deb2 100644 --- a/addons/rose/addon/styles/rose/components/header/_catchall.scss +++ b/addons/rose/addon/styles/rose/components/header/_catchall.scss @@ -1,34 +1,3 @@ -.rose-header-nav { - grid-area: nav; - - .rose-header-nav-flex { - display: flex; - flex-wrap: wrap; - } - - .rose-header-nav-link { - text-decoration: none; - display: block; - color: var(--white); - border: 1px solid var(--stark); - border-radius: sizing.rems(xxs); - text-align: center; - padding: sizing.rems(xxs) sizing.rems(s); - position: relative; - top: sizing.rems(xxxs); - cursor: pointer; - margin: 0 sizing.rems(xs); - - &:hover { - background: var(--ui-gray-starker-3); - } - - &:active { - background: var(--ui-gray-starker-2); - } - } -} - .rose-header-utilities { grid-area: utilities; @@ -111,26 +80,3 @@ } } } - -@media (max-width: media.width(small)) { - .rose-header { - grid-template-columns: 1fr 3fr; - grid-template-areas: - 'brand utilities' - 'nav nav'; - padding-bottom: 0; - - .rose-header-nav { - background: var(--ui-header-subtler); - padding: sizing.rems(xs) sizing.rems(s); - - .rose-header-nav-link { - border: 1px solid var(--ui-gray-subtler); - - &:hover { - background: var(--ui-gray-starker-3); - } - } - } - } -} diff --git a/addons/rose/addon/styles/rose/components/header/_index.scss b/addons/rose/addon/styles/rose/components/header/_index.scss index e8b593805..25dc59f2f 100644 --- a/addons/rose/addon/styles/rose/components/header/_index.scss +++ b/addons/rose/addon/styles/rose/components/header/_index.scss @@ -4,6 +4,7 @@ @import 'brand'; @import 'nav'; +@import 'link'; $dropdown-chevron: ( 'default': diff --git a/addons/rose/addon/styles/rose/components/header/nav/_link.scss b/addons/rose/addon/styles/rose/components/header/_link.scss similarity index 88% rename from addons/rose/addon/styles/rose/components/header/nav/_link.scss rename to addons/rose/addon/styles/rose/components/header/_link.scss index 8a143fcd2..e1620d910 100644 --- a/addons/rose/addon/styles/rose/components/header/nav/_link.scss +++ b/addons/rose/addon/styles/rose/components/header/_link.scss @@ -1,5 +1,5 @@ -@use '../../../variables/sizing'; -@use '../../../utilities/type'; +@use '../../variables/sizing'; +@use '../../utilities/type'; .rose-header-nav-link { @include type.type(s, semibold); diff --git a/addons/rose/addon/styles/rose/components/header/nav/_index.scss b/addons/rose/addon/styles/rose/components/header/_nav.scss similarity index 71% rename from addons/rose/addon/styles/rose/components/header/nav/_index.scss rename to addons/rose/addon/styles/rose/components/header/_nav.scss index e950cb452..6e50ec714 100644 --- a/addons/rose/addon/styles/rose/components/header/nav/_index.scss +++ b/addons/rose/addon/styles/rose/components/header/_nav.scss @@ -1,7 +1,5 @@ -@use '../../../variables/sizing'; -@use '../../../variables/media'; - -@import 'link'; +@use '../../variables/sizing'; +@use '../../variables/media'; .rose-header-nav { grid-area: nav;