Merge branch 'master' into 'master'

Remove double bottom border for tabs See merge request gitlab-org/gitlab!78942

Merge branch 'master' into 'master'
Remove double bottom border for tabs See merge request gitlab-org/gitlab!78942
43206661 · Olena Horal-Koretska · 320faa92 · 0f60cd2d · 43206661
Commit 43206661 authored Jan 31, 2022 by Olena Horal-Koretska
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

app/assets/stylesheets/framework/secondary_navigation_elements.scss .../stylesheets/framework/secondary_navigation_elements.scss +2 -3

No files found.
--- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss
+++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss
@@ -18,7 +18,6 @@
      line-height: 28px;
      color: $gl-text-color-secondary;
      border: 0;
-      border-bottom: 2px solid transparent;
      white-space: nowrap;

      &:hover,
@@ -26,7 +25,7 @@
      &:focus {
        text-decoration: none;
        color: $black;
-        border-bottom: 2px solid $gray-darkest;
+        box-shadow: inset 0 -2px 0 0 $gray-darkest;
      }
    }

@@ -40,7 +39,7 @@
    a.active {
      color: $black;
      font-weight: $gl-font-weight-bold;
-      border-bottom: 2px solid var(--gl-theme-accent, $theme-indigo-500);
+      box-shadow: inset 0 -2px 0 0 var(--gl-theme-accent, $theme-indigo-500);

      .badge.badge-pill {
        color: $black;