diff --git a/content/assets/scripts/search.coffee b/content/assets/scripts/search.coffee index 12d6a4f..71acd1b 100644 --- a/content/assets/scripts/search.coffee +++ b/content/assets/scripts/search.coffee @@ -4,6 +4,6 @@ $('#tipue_search_input_field').on 'focusin', -> $('#tipue_search_input_field').on 'focusout', -> $('#tipue_search_input').removeClass("focused") -$('.nav-toggle').on 'click', -> - $('.nav-menu').toggleClass('is-active') - $('.nav-toggle').toggleClass('is-active') +$('.navbar-burger').on 'click', -> + $('.navbar-menu').toggleClass('is-active') + $('.navbar-burger').toggleClass('is-active') diff --git a/content/assets/stylesheets/includes/cammie.scss b/content/assets/stylesheets/includes/cammie.scss index 7505918..52703bb 100644 --- a/content/assets/stylesheets/includes/cammie.scss +++ b/content/assets/stylesheets/includes/cammie.scss @@ -50,20 +50,13 @@ } } #cammie-section { - - .nav-center{ - width:100%; - } button{ background-color: $orange; color: white; margin-top: 5px; border-radius: 0; border: none; - width: 33.333333333333333333333333333333333333333333333333333%; - &:not(:last-child){ - margin-right: 5px; - } + width: 100%; &:hover{ color: #363636; } diff --git a/content/assets/stylesheets/includes/navbar.scss b/content/assets/stylesheets/includes/navbar.scss index 7adfc9b..cf1c461 100644 --- a/content/assets/stylesheets/includes/navbar.scss +++ b/content/assets/stylesheets/includes/navbar.scss @@ -17,62 +17,39 @@ } } - .nav-menu { - z-index: 20; - - .nav-transparent { - background: none; - } - } - - .actual-nav-bar { - padding: 0; - margin: 10px; - margin-bottom: 0; - border-bottom: 1px solid #eee; - } - - #inline-logo { - min-width: 38.703px; - } - #logo-link { + @include desktop { + width: 124px; + border-bottom: 2px solid $body-background; + margin-bottom: -2px; + } #logo { - padding-left: 10px; - width: 100px; + @include desktop { + max-width: none; + max-height: none; + left: 0; + bottom: 5px; + width: 100px; + position: absolute; + } } } - //Height of the line underneath when hovering over a menu item - $border-height: 3px; + .navbar-item { + font-variant: small-caps; + font-size: 1.15em; + } - .nav { - height: 100%; - align-items: flex-end; - z-index: auto; - - .nav-item { - transition: 0.2s; - - font-variant: small-caps; - font-size: 1.15em; - - &:not(.nav-search) { - border-bottom: $border-height solid transparent; - border-top: 3px solid transparent; + .navbar:not(.is-transparent) { + .navbar-item { + &:not(.is-active) { + color: #7a7a7a; } - &:hover { - transition: 0.2s; - } - - &.social-icon { - padding-left: 5px; - padding-right: 5px; - } - - &:not(.nav-search):hover, &.is-active { - border-bottom-color: $zeus-orange; + &.is-active { + color: $primary; + border-bottom: 2px solid; + margin-bottom: -2px; } } } diff --git a/content/assets/stylesheets/includes/variables.scss b/content/assets/stylesheets/includes/variables.scss index 7f2eeac..c025187 100644 --- a/content/assets/stylesheets/includes/variables.scss +++ b/content/assets/stylesheets/includes/variables.scss @@ -15,6 +15,7 @@ $turquoise: #30D1B2; $family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; +$link: $orange; $link-visited: $orange; $border-hover: $blue; diff --git a/content/cammie.erb b/content/cammie.erb index ddea60b..de0dfe2 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -49,14 +49,18 @@ title: Cammie -