summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-06-20 15:29:45 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-06-25 12:53:23 +0100
commitfd4e2fcf7a34a4d739b29a13955be1afb6bf13f1 (patch)
tree804e3aafb33c4482aa869d753fc81631d751fee2
parentae04ccbca46260f206e8a910f9c533bd16583d0e (diff)
downloadgitlab-ce-fd4e2fcf7a34a4d739b29a13955be1afb6bf13f1.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 391db0f0603..0c0d25693fb 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;
}
}