Commit 5f4ab1cd authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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
parents 37abb20c f882177a
...@@ -63,7 +63,11 @@ header { ...@@ -63,7 +63,11 @@ header {
&:focus, &:focus,
&:active { &:active {
background-color: $background-color; 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 { .fa-caret-down {
...@@ -194,7 +198,7 @@ header { ...@@ -194,7 +198,7 @@ header {
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: darken($color: $gl-text-color, $amount: 50%); color: darken($color: $gl-text-color, $amount: 30%);
} }
} }
......
...@@ -157,7 +157,6 @@ ...@@ -157,7 +157,6 @@
width: 68%; width: 68%;
} }
} }
} }
.search-holder { .search-holder {
...@@ -234,5 +233,4 @@ ...@@ -234,5 +233,4 @@
&:focus { &:focus {
color: $gl-link-color; color: $gl-link-color;
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment