summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-06-20 15:29:45 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-06-20 15:29:45 +0000
commit81beb5d5994f861a895244589324a3bde686c00f (patch)
tree1fe62d1773a45aeb216ccbf576a58a860dad17b9
parent222284a6bf9348b30b5ce2b1b04370163e2120e5 (diff)
parent14098af372a7bd1cc3d5a99bcd698120efa36ae5 (diff)
downloadgitlab-ce-81beb5d5994f861a895244589324a3bde686c00f.tar.gz
Merge branch 'revert-80044bda' into 'master'
Revert "Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'" Closes #48171 See merge request gitlab-org/gitlab-ce!20035
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss5
-rw-r--r--app/assets/stylesheets/framework/contextual_sidebar.scss1
2 files changed, 0 insertions, 6 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index e6303ad4642..0d8e867f41d 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -89,11 +89,6 @@ 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 cccd1a6d942..9cbaaa5dc8d 100644
--- a/app/assets/stylesheets/framework/contextual_sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual_sidebar.scss
@@ -193,7 +193,6 @@
&:focus {
background: $link-active-background;
color: $gl-text-color;
- text-decoration: none;
}
}