root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'winh-comment-action-dropdown' into 'master' 

Make comment actions dropdown style consistent

See merge request !13476
This commit is contained in:
Phil Hughes 2017-09-04 07:26:16 +00:00
parent a3af683045 5c592a9dcf
commit fd54a4678f
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/framework/dropdowns.scss
View File

@ -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 {

22
app/assets/stylesheets/pages/notes.scss
View File

@ -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 {