diff --git a/app/assets/stylesheets/partials/_header.scss b/app/assets/stylesheets/partials/_header.scss index 6704ea3d..31a7eac1 100644 --- a/app/assets/stylesheets/partials/_header.scss +++ b/app/assets/stylesheets/partials/_header.scss @@ -92,11 +92,7 @@ font-size: 1.8rem; font-weight: $fw-medium; @include text-decoration-animation; - - &:hover { - text-decoration: underline; - color: $color-white; - } + @include headerUnderlinedLinks; } } } diff --git a/app/assets/stylesheets/partials/_search.scss b/app/assets/stylesheets/partials/_search.scss index 14594bb3..dd857626 100644 --- a/app/assets/stylesheets/partials/_search.scss +++ b/app/assets/stylesheets/partials/_search.scss @@ -2,19 +2,6 @@ // #SEARCH BITS // ------------------------ -/* Shared link styling */ -@mixin searchUnderlinedLinks { - color: $color-text-oncolor; - font-weight: $fw-medium; - text-decoration: underline; - text-decoration-color: $color-red-500; - text-underline-offset: 0.5rem; - - &:hover { - color: $color-red-400; - } -} - /* New USE UI search styles */ #search-form { margin: 0; @@ -299,7 +286,7 @@ gap: 24px; a { - @include searchUnderlinedLinks(); + @include headerUnderlinedLinks(); } .semantic-search-toggle { @@ -310,7 +297,7 @@ background-color: transparent; border: none; cursor: pointer; - @include searchUnderlinedLinks(); + @include headerUnderlinedLinks(); &::before { background-color: $color-gray-800; diff --git a/app/assets/stylesheets/partials/_source_tabs.scss b/app/assets/stylesheets/partials/_source_tabs.scss index ee30f9d1..8f19b735 100644 --- a/app/assets/stylesheets/partials/_source_tabs.scss +++ b/app/assets/stylesheets/partials/_source_tabs.scss @@ -37,7 +37,7 @@ border-bottom: 0; white-space: nowrap; - @include searchUnderlinedLinks; + @include headerUnderlinedLinks; &:hover { border-color: $color-gray-700; @@ -87,7 +87,7 @@ width: 100%; &.active { - @include searchUnderlinedLinks; + @include headerUnderlinedLinks; } &:hover { diff --git a/app/assets/stylesheets/partials/_typography.scss b/app/assets/stylesheets/partials/_typography.scss index f9ad6957..e30f6a4d 100644 --- a/app/assets/stylesheets/partials/_typography.scss +++ b/app/assets/stylesheets/partials/_typography.scss @@ -22,6 +22,19 @@ } } +/* Shared link styling */ +@mixin headerUnderlinedLinks { + color: $color-text-oncolor; + font-weight: $fw-medium; + text-decoration: underline; + text-decoration-color: $color-red-500; + text-underline-offset: 0.5rem; + + &:hover { + color: $color-red-400; + } +} + // Override fonts from the theme gem, done temporarily for USE UI body { font-family: $base-font; diff --git a/app/views/layouts/_site_header.html.erb b/app/views/layouts/_site_header.html.erb index ed0096d1..065cff9f 100644 --- a/app/views/layouts/_site_header.html.erb +++ b/app/views/layouts/_site_header.html.erb @@ -18,12 +18,14 @@ <%= ENV.fetch('PLATFORM_NAME') %> <% end %> - <% if Feature.enabled?(:geodata) %> - - <% end %> + <%= render partial: 'search/form' unless Feature.enabled?(:geodata) %>