summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-09-02 22:19:20 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-09-02 22:19:20 +0000
commit2aaab34b67eb2a6593780eda33d501a715ef0c5f (patch)
treed4c9e48d2ca1a96a49e32d3545e696616f9436b9
parent87f93ceb9542c415d6c23c72ff93d63272107d54 (diff)
parent610fafc706de465fbefe172caa443ebc12d43ce2 (diff)
downloadgitlab-ce-2aaab34b67eb2a6593780eda33d501a715ef0c5f.tar.gz
Merge branch 'fix-suggested-colors-underline' into 'master'
Remove suggested colors hover underline ## What does this MR do? * Removes the blue hover underline for the suggested color containers * Added `cursor: pointer` to the suggested color containers ## Are there points in the code the reviewer needs to double check? Shouldn't be :smile: ## Why was this MR needed? Improves UI ## Screenshots (if relevant) Before: ![DS48AvgSVX](/uploads/0077e7a5837c8ce9fe2493ad6a42a018/DS48AvgSVX.gif) After: ![olZzS68WNr](/uploads/4e0ae808c69942a528f1303df8cddeae/olZzS68WNr.gif) ## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? Closes #21792 See merge request !6165
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/pages/labels.scss1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8f139d0ad12..93e91c457a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 8.12.0 (unreleased)
- Fix bug where pagination is still displayed despite all todos marked as done (ClemMakesApps)
- Center build stage columns in pipeline overview (ClemMakesApps)
- Rename behaviour to behavior in bug issue template for consistency (ClemMakesApps)
+ - Remove suggested colors hover underline (ClemMakesApps)
- Shorten task status phrase (ClemMakesApps)
- Add hover color to emoji icon (ClemMakesApps)
- Fix branches page dropdown sort alignment (ClemMakesApps)
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 606459f82cd..38c7cd98e41 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -7,6 +7,7 @@
display: inline-block;
margin-right: 10px;
margin-bottom: 10px;
+ text-decoration: none;
}
&.suggest-colors-dropdown {