summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-11-15 16:20:53 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-11-15 16:20:53 +0000
commit5f4ab1cd0212d80dac503c598e1cb0b7a72237af (patch)
tree60d8c339ab8dd791d0997f7bc123f48f760e58aa
parent37abb20cec2a9836a7d1d70a7f7535af6646df1e (diff)
parentf882177a4fc0360e25cd53b4cd441b520cae7386 (diff)
downloadgitlab-ce-5f4ab1cd0212d80dac503c598e1cb0b7a72237af.tar.gz
Merge branch 'darken-badge-hover' into 'master'
Darken todo badge on hover ## What does this MR do? Darkens todo badge on hover ## Screenshots (if relevant) ![Screen_Shot_2016-11-14_at_10.37.54_AM](/uploads/7636834062fcce3517b0708304ad57c4/Screen_Shot_2016-11-14_at_10.37.54_AM.png) ![Screen_Shot_2016-11-14_at_10.37.42_AM](/uploads/d79be1285b926f28f71c103c4ab54d5a/Screen_Shot_2016-11-14_at_10.37.42_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7462
-rw-r--r--app/assets/stylesheets/framework/header.scss8
-rw-r--r--app/assets/stylesheets/pages/search.scss2
2 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 0e0673a72f6..16ecf466931 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -63,7 +63,11 @@ header {
&:focus,
&:active {
background-color: $background-color;
- color: darken($gl-icon-color, 50%);
+ color: darken($gl-icon-color, 30%);
+
+ .todos-pending-count {
+ background: darken($todo-alert-blue, 10%);
+ }
}
.fa-caret-down {
@@ -194,7 +198,7 @@ header {
cursor: pointer;
&:hover {
- color: darken($color: $gl-text-color, $amount: 50%);
+ color: darken($color: $gl-text-color, $amount: 30%);
}
}
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss
index 1a116f6a919..e9ba2e5c098 100644
--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
@@ -157,7 +157,6 @@
width: 68%;
}
}
-
}
.search-holder {
@@ -234,5 +233,4 @@
&:focus {
color: $gl-link-color;
}
-
}