diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss index c3ddffab..f7332395 100644 --- a/app/assets/stylesheets/application.sass.scss +++ b/app/assets/stylesheets/application.sass.scss @@ -6,18 +6,21 @@ $color-cardinal-red: #8c1515; $gray-41-percent: #696969; $sul-footer-bg-color: #f2f1eb; -$sul-topnavbar-link-color: $color-cardinal-red; $sul-link-color-border: #b6b1a9; -$sul-body-bg: #fbfbf9; -$sul-text-color: #000; - $sul-h1-font-color: #3f3c30; $sul-h2-border-color: #e3dfd5; $sul-shadow-color: rgba(0, 0, 0, .2); -@import 'bootstrap-variables'; +:root { +--bs-link-color: #000; +--bs-link-hover-color: #000; +--bs-body-bg: fbfbf9; +} + +h1, h2 { + font-weight: 300; +} -@import 'bootstrap/scss/bootstrap'; @import 'base'; @import 'layout'; diff --git a/app/assets/stylesheets/bootstrap-variables.scss b/app/assets/stylesheets/bootstrap-variables.scss deleted file mode 100644 index d66846c6..00000000 --- a/app/assets/stylesheets/bootstrap-variables.scss +++ /dev/null @@ -1,16 +0,0 @@ -// Override Bootstrap variables here - -// Body -$body-bg: $sul-body-bg; - -// Text / Links -$text-color: $sul-text-color; -$link-color: $sul-text-color; -$link-hover-color: $sul-text-color; - -// Colors -$primary: $color-cardinal-red; -$component-active-bg: #80bdff; - -// Typography -$headings-font-weight: 300; diff --git a/app/assets/stylesheets/modules/top-navbar.scss b/app/assets/stylesheets/modules/top-navbar.scss index 2cc409b4..ceaee0d2 100644 --- a/app/assets/stylesheets/modules/top-navbar.scss +++ b/app/assets/stylesheets/modules/top-navbar.scss @@ -4,37 +4,13 @@ } #topnav { - @extend .row; border: none; background: none; margin-bottom: 0; - padding: 2px 0; - - .header-links { - @extend .col-1; - margin-left: auto; - margin-top: 2px; - a { - font-weight: normal; - margin-left: 15px; - padding-bottom: 3px; - color: $sul-topnavbar-link-color; - border-bottom: none; - &.first { - margin-left: 0; - } - } - a:hover { - border-bottom: 3px solid $sul-topnavbar-link-color; - } - } - -} + padding: 2px 10px; + width: 100%; -@include media-breakpoint-down(xs) { - #topnav { - padding-left: 10px; - padding-right: 10px; - width: 100%; + & > a { + border: none; } } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d0dad93f..8001db7f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,6 +8,7 @@