summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwinh <winnie@gitlab.com>2017-08-10 21:25:43 +0200
committerwinh <winnie@gitlab.com>2017-08-28 13:19:20 +0200
commit5c592a9dcfc46a51f3a803c33c47c77f68fe692d (patch)
tree0cf8a33b4f50f7135c9217f3704de6d63466452e
parentef8eb3f6f7c1af167017ecc854e9fe385cee9354 (diff)
downloadgitlab-ce-winh-comment-action-dropdown.tar.gz
Make comment actions dropdown style consistentwinh-comment-action-dropdown
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss2
-rw-r--r--app/assets/stylesheets/pages/notes.scss22
2 files changed, 5 insertions, 19 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index a45d5a6dca0..ace8ec81ad0 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -751,6 +751,8 @@
button {
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 0a194f3707f..d1771606aea 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -365,9 +365,7 @@ ul.notes {
}
.discussion-header,
-.note-header {
- position: relative;
-
+.note-header-info {
a {
color: inherit;
@@ -453,6 +451,8 @@ ul.notes {
}
.note-actions {
+ @include new-style-dropdown;
+
align-self: flex-start;
flex-shrink: 0;
display: inline-flex;
@@ -488,22 +488,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 {