summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-07-25 22:25:40 +0000
committerFatih Acet <acetfatih@gmail.com>2016-07-25 22:25:40 +0000
commite5c2fdf718df9164fa6d1c649a8bff4233a24a44 (patch)
tree7457c10787fbbf4cd3d99eb5d491ce25e80d89be
parent440b14daadcca0244d20c1a2a5d57e334cda0933 (diff)
parentaa3c13491d3d4a20beadc5ff76da35665a6903a6 (diff)
downloadgitlab-ce-e5c2fdf718df9164fa6d1c649a8bff4233a24a44.tar.gz
Merge branch 'fix-ci-status-link-css' into 'master'
Fix CI status icon link underline ## What does this MR do? Changes the CSS so that CI status icon does not underline when it is hovered over. ## Are there points in the code the reviewer needs to double check? Just need to make sure there aren't any side effects (`.ci-status-link` being used without an icon). To my knowledge, every instance of `.ci-status-link` is tied to a `.ci-status-icon-{statusName}`. ## Why was this MR needed? Resolves existing bug ## What are the relevant issue numbers? #20103 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5408
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss5
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ca4014461f0..d25f61a3096 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.11.0 (unreleased)
- Remove magic comments (`# encoding: UTF-8`) from Ruby files !5456 (winniehell)
+ - Fix CI status icon link underline (ClemMakesApps)
- Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
- Limit git rev-list output count to one in forced push check
- Add green outline to New Branch button !5447 (winniehell)
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index db295935b00..0a661e529f0 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -216,6 +216,11 @@
position: relative;
top: 3px;
}
+
+ &:hover,
+ &:focus {
+ text-decoration: none;
+ }
}
}
}