diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-12-14 10:10:57 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-12-14 10:10:57 +0200 |
| commit | 485e910085f34388b86909f86dd7a999a585476d (patch) | |
| tree | 604379497a1ddfd55c85d5a56c14d0b8a22a94b2 | |
| parent | a5e449571bb941d65d33569a0f0db575a5b3d399 (diff) | |
| parent | eec4751bd0865498a925e89930465b40ea849ea2 (diff) | |
| download | gitlab-ce-485e910085f34388b86909f86dd7a999a585476d.tar.gz | |
Merge branch 'improve_emoji'
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/awards.scss | 21 |
2 files changed, 21 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7359bda421b..45446ec142e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -49,6 +49,7 @@ v 8.3.0 (unreleased) - Fix deleting notes on a merge request diff - Display referenced merge request statuses in the issue description (Greg Smethells) - Implement new sidebar for issue and merge request pages + - Emoji picker improvements v 8.2.3 - Fix application settings cache not expiring after changes (Stan Hu) diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss index f6d85221484..041b811a606 100644 --- a/app/assets/stylesheets/pages/awards.scss +++ b/app/assets/stylesheets/pages/awards.scss @@ -12,10 +12,18 @@ border-color: $border-color; cursor: pointer; + &:hover { + background-color: #dce0e5; + } + &.active { border-color: $border-gray-light; background-color: $gray-light; + &:hover { + background-color: #dce0e5; + } + .counter { font-weight: bold; } @@ -53,7 +61,18 @@ > li { cursor: pointer; - margin: 5px; + width: 30px; + height: 30px; + text-align: center; + @include border-radius(5px); + + img { + margin-bottom: 2px; + } + + &:hover { + background-color: #ccc; + } } } } |