summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-06-19 15:31:58 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-06-19 15:31:58 +0000
commit80044bdad09cfa09f89e4e45b49fc0abb19a6c84 (patch)
tree41fc3360c0ce6abb5f17acbaf496d26e2a647471
parentabdbe370a0cdef03ccb9d5be923436ba513b956c (diff)
parent37bd3d44c6c985fc6e2a61488aadd31b01f36eb0 (diff)
downloadgitlab-ce-80044bdad09cfa09f89e4e45b49fc0abb19a6c84.tar.gz
Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'
Fix missing underline on focus states for anchor tags Closes #47748 See merge request gitlab-org/gitlab-ce!19873
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss5
-rw-r--r--app/assets/stylesheets/framework/contextual_sidebar.scss1
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 0d8e867f41d..e6303ad4642 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -89,6 +89,11 @@ a {
color: $gl-link-color;
}
+a:not(.btn):focus,
+a:not(.btn):active {
+ text-decoration: underline;
+}
+
hr {
overflow: hidden;
}
diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss
index 9cbaaa5dc8d..cccd1a6d942 100644
--- a/app/assets/stylesheets/framework/contextual_sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual_sidebar.scss
@@ -193,6 +193,7 @@
&:focus {
background: $link-active-background;
color: $gl-text-color;
+ text-decoration: none;
}
}