diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-01 13:55:50 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-07 15:33:18 -0700 |
| commit | 3cfeb3755828871813cd12c771fa7efddf67edb5 (patch) | |
| tree | 31e6adca5ef583ecc09a3adbe667ee43f6ed18f0 /app/assets | |
| parent | 87b3c73ea560d6091a17e7b759864b90911f5f1c (diff) | |
| download | gitlab-ce-3cfeb3755828871813cd12c771fa7efddf67edb5.tar.gz | |
Merge conflict fixes
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index d9dc7820184..93fcb81321a 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -194,6 +194,21 @@ ul.notes { float: right; margin-left: 10px; color: $notes-action-color; + + .js-note-delete { + &:hover { + @extend .cgray; + &.danger { @extend .cred; } + } + } + + .js-note-edit { + i { + &:hover { + color: $gl-link-color; + } + } + } } .note-action-button, @@ -212,21 +227,6 @@ ul.notes { top: 0; font-size: 16px; } - - .js-note-delete { - &:hover { - @extend .cgray; - &.danger { @extend .cred; } - } - } - - .js-note-edit { - i { - &:hover { - color: $gl-link-color; - } - } - } } .discussion-toggle-button { |