diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-29 19:01:22 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-29 19:01:22 +0000 |
commit | 8f98b704edbf6e9bd24da717f78c8cb2aa935370 (patch) | |
tree | da47193a35a9b1a3395159e58e35344e05fb250d | |
parent | ef6a91af123d8b773ba8a286cf986abaedee6c33 (diff) | |
parent | 30c3eed89b023f84d9f1fdd8ddb6af4c7e7a05eb (diff) | |
download | gitlab-ce-8f98b704edbf6e9bd24da717f78c8cb2aa935370.tar.gz |
Merge branch '25011-hoverstates-for-collapsed-issue-merge-request-sidebar' into 'master'
Adds hoverstates for collapsed Issue/Merge Request sidebar
This MR is part 1/2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/25011
## What does this MR do?
Adds hoverstates for collapsed Issue/Merge Request sidebar
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
We needed hover states on the issue/merge request sidebar
## Screenshots (if relevant)
![2016-11-27_23.39.28](/uploads/adb83f5fa291cc8f89f1a7d7e2577546/2016-11-27_23.39.28.gif)![2016-11-27_23.39.13](/uploads/7018e4272da26cb06efb7c6fe4eae413/2016-11-27_23.39.13.gif)
![2016-11-29_16.05.11](/uploads/fcf9a674aa24cf0e7349a7e439b024fe/2016-11-29_16.05.11.gif)
## Does this MR meet the acceptance criteria?
- [x] [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?
Closes #25011
See merge request !7777
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 16 | ||||
-rw-r--r-- | changelogs/unreleased/25011-hoverstates-for-collapsed-issue-merge-request-sidebar.yml | 4 |
2 files changed, 15 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 773155fe80a..7aad99eee4e 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -132,7 +132,7 @@ display: none; } - .btn-clipboard { + .btn-clipboard:hover { color: $gl-gray; } } @@ -235,6 +235,10 @@ padding-bottom: 10px; color: #999; + &:hover { + color: $gl-gray; + } + span { display: block; margin-top: 0; @@ -244,15 +248,17 @@ display: none; } + .avatar:hover { + border-color: #999; + } + .btn-clipboard { border: none; + color: #999; &:hover { background: transparent; - } - - i { - color: #999; + color: $gl-gray; } } } diff --git a/changelogs/unreleased/25011-hoverstates-for-collapsed-issue-merge-request-sidebar.yml b/changelogs/unreleased/25011-hoverstates-for-collapsed-issue-merge-request-sidebar.yml new file mode 100644 index 00000000000..2c3ba1dfe44 --- /dev/null +++ b/changelogs/unreleased/25011-hoverstates-for-collapsed-issue-merge-request-sidebar.yml @@ -0,0 +1,4 @@ +--- +title: Adds hoverstates for collapsed Issue/Merge Request sidebar +merge_request: !7777 +author: |