kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '31727-timestamps-in-merge-request-discussion-overflow-role-badge' into 'master'

Browse source 
Wrap note actions below timestamp on discussions

Closes #31727 and #30984

See merge request !11062
This commit is contained in:
Annabel Dunstone Gray 2017-05-05 14:47:03 +00:00
commit f62afa01b1
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/assets/stylesheets/pages/notes.scss
View file

@ -130,12 +130,6 @@ ul.notes {
} }
.note-header { .note-header {
padding-bottom: 8px;
padding-right: 20px;
@media (min-width: $screen-sm-min) {
padding-right: 0;
}
@media (max-width: $screen-xs-min) { @media (max-width: $screen-xs-min) {
.inline { .inline {
@ -384,10 +378,15 @@ ul.notes {
.note-header { .note-header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@media (max-width: $screen-xs-max) {
flex-flow: row wrap;
}
} }
.note-header-info { .note-header-info {
min-width: 0; min-width: 0;
padding-bottom: 5px;
} }
.note-headline-light { .note-headline-light {
@ -435,6 +434,11 @@ ul.notes {
margin-left: 10px; margin-left: 10px;
color: $gray-darkest; color: $gray-darkest;
@media (max-width: $screen-xs-max) {
float: none;
margin-left: 0;
}
.note-action-button { .note-action-button {
margin-left: 8px; margin-left: 8px;
} }