diff options
author | Phil Hughes <me@iamphill.com> | 2017-09-04 10:26:16 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-09-04 10:26:16 +0300 |
commit | fd54a4678f23c9e18ce46b3803e5e57ffa1199a3 (patch) | |
tree | 29faf7d442d12fd22d5520c700b8873da4991a11 /app | |
parent | a3af683045e0170d975eab2562a466f88d2692b8 (diff) | |
parent | 5c592a9dcfc46a51f3a803c33c47c77f68fe692d (diff) |
Merge branch 'winh-comment-action-dropdown' into 'master'
Make comment actions dropdown style consistent
See merge request !13476
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 22 |
2 files changed, 5 insertions, 19 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 110b171676a..1c40c7155c1 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -757,6 +757,8 @@ .menu-item { border-radius: 0; padding: 8px 16px; + text-align: left; + width: 100%; // make sure the text color is not overriden &.text-danger { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 764984c5772..45f2aed1531 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -379,9 +379,7 @@ ul.notes { } .discussion-header, -.note-header { - position: relative; - +.note-header-info { a { color: inherit; @@ -471,6 +469,8 @@ ul.notes { } .note-actions { + @include new-style-dropdown; + align-self: flex-start; flex-shrink: 0; display: inline-flex; @@ -506,22 +506,6 @@ ul.notes { .more-actions-dropdown { width: 180px; min-width: 180px; - margin-top: $gl-btn-padding; - - li > a, - li > .btn { - color: $gl-text-color; - padding: $gl-btn-padding; - width: 100%; - text-align: left; - - &:hover, - &:focus { - color: $gl-text-color; - background-color: $blue-25; - border-radius: $border-radius-default; - } - } } .discussion-actions { |