From 229e169bbf025603629778aebd33896cd392915e Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Wed, 25 Mar 2020 04:25:36 +1300 Subject: [PATCH] Getting there --- src/renderer/components/top-nav/top-nav.sass | 204 ++++++++----------- 1 file changed, 81 insertions(+), 123 deletions(-) diff --git a/src/renderer/components/top-nav/top-nav.sass b/src/renderer/components/top-nav/top-nav.sass index e3fefd86..ec0028b0 100644 --- a/src/renderer/components/top-nav/top-nav.sass +++ b/src/renderer/components/top-nav/top-nav.sass @@ -1,3 +1,10 @@ +@use "sass:selector" + +@mixin top-nav-is-colored + @at-root + .topNavBarColor &, .topNavBarColor#{&} + @content + .topNav position: fixed z-index: 4 @@ -12,15 +19,12 @@ grid-template-columns: 1fr auto 1fr align-items: center + @include top-nav-is-colored + background-color: var(--primary-color) -.side - display: flex - align-items: center - - -.topNavBarColor - background-color: var(--primary-color) - +.menuIcon + @include top-nav-is-colored + background-color: var(--primary-color-active) .navIcon font-size: 20px @@ -29,149 +33,103 @@ color: var(--primary-text-color) border-radius: 50% transition: background 0.2s ease-out + width: 1em + height: 1em + @include top-nav-is-colored + color: var(--text-with-main-color) -.topNavBarColor .navIcon - color: var(--text-with-main-color) + &:hover + background-color: var(--primary-color-hover) + &:hover + background-color: var(--side-nav-hover-color) + transition: background 0.2s ease-in -.navIcon:hover - background-color: var(--side-nav-hover-color) - transition: background 0.2s ease-in + &:active + background-color: var(--tertiary-text-color) + transition: background 0.2s ease-in - -.topNavBarColor .navIcon:hover - background-color: var(--primary-color-hover) - - -.navIcon:active - background-color: var(--tertiary-text-color) - transition: background 0.2s ease-in - - -.topNavBarColor .menuIcon:active - background-color: var(--primary-color-active) - - -.navBackIcon - top: 10px - left: 50px - - -.navForwardIcon - top: 10px - left: 85px - - -.navSearchIcon - top: 10px - display: none - -.logo +.side display: flex align-items: center - padding: 0px 25px 0px 10px - .logoIcon - background-image: var(--logo-icon) - background-repeat: no-repeat - background-position: right top - background-size: 25px - width: 25px - height: 25px + .navSearchIcon + @media only screen and (min-width: 681px) + display: none + + .logo + display: flex + align-items: center + padding: 0px 25px 0px 10px + + .logoIcon + background-image: var(--logo-icon) + background-repeat: no-repeat + background-position: right top + background-size: 25px + width: 25px + height: 25px - .logoIconBarColor - background-image: var(--logo-icon-bar-color) + .logoIconBarColor + background-image: var(--logo-icon-bar-color) - .logoText - margin-left: 5px - position: relative - top: -3px - background-image: var(--logo-text) - background-repeat: no-repeat - background-position: right top - background-size: 100px - width: 100px - height: 40px + .logoText + margin-left: 5px + position: relative + top: -3px + background-image: var(--logo-text) + background-repeat: no-repeat + background-position: right top + background-size: 100px + width: 100px + height: 40px + @media only screen and (max-width: 680px) + display: none - .logoTextBarColor - background-image: var(--logo-text-bar-color) + .logoTextBarColor + background-image: var(--logo-text-bar-color) .middle - .searchContainer display: flex align-items: center - .searchInput - width: 400px + @include top-nav-is-colored + background-color: var(--primary-color-hover) + + @media only screen and (max-width: 680px) + position: fixed + left: 0 + right: 0 + top: 60px + display: none + background-color: var(--side-nav-color) + + .searchInput + width: 420px + + @media only screen and (max-width: 680px) + flex: 1 .searchFilters position: absolute - margin-left: 270px - margin-right: 20px - margin-top: 10px - margin-bottom: 20px - transition-property: margin - transition-duration: 150ms - transition-timing-function: ease-in-out + margin: 10px 20px 20px 270px + transition: margin 150ms ease-in-out + @media only screen and (max-width: 680px) + left: 0 + right: 0 + margin: 95px 10px 0px +// ? .expand margin-left: 100px - +// unsure where to group this selector instead @media only screen and (max-width: 680px) .menuIcon display: none - - - .navBackIcon - left: 45px - - - .navForwardIcon - left: 80px - - - .navSearchIcon - display: block - left: 120px - - - .logoIcon - left: 10px - - - .logoText - display: none - - - .searchContainer - position: fixed - display: none - width: 100% - top: 60px - background-color: var(--side-nav-color) - - - .topNavBarColor .searchContainer - background-color: var(--primary-color-hover) - - - .searchInput - width: 80% - margin: 0 auto - - - .navFilterIcon - right: 0px - - - .searchFilters - margin-top: 130px - margin-left: 10px - margin-right: 10px