diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-05 14:47:03 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-05 14:47:03 +0000 |
commit | f62afa01b1b9b73d9a30bf5125ac9a39e6be0e01 (patch) | |
tree | b9dcf62748da0b391d23f3ad2d8ccca236595caf | |
parent | c89849af47dc3ce788adbc7ef06af8a39a5347fd (diff) | |
parent | 513b96f4eedd864b5f56e63fd5342deba53cc870 (diff) | |
download | gitlab-ce-f62afa01b1b9b73d9a30bf5125ac9a39e6be0e01.tar.gz |
Merge branch '31727-timestamps-in-merge-request-discussion-overflow-role-badge' into 'master'
Wrap note actions below timestamp on discussions
Closes #31727 and #30984
See merge request !11062
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index cfea52c6e57..69c328d09ff 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -130,12 +130,6 @@ ul.notes { } .note-header { - padding-bottom: 8px; - padding-right: 20px; - - @media (min-width: $screen-sm-min) { - padding-right: 0; - } @media (max-width: $screen-xs-min) { .inline { @@ -384,10 +378,15 @@ ul.notes { .note-header { display: flex; justify-content: space-between; + + @media (max-width: $screen-xs-max) { + flex-flow: row wrap; + } } .note-header-info { min-width: 0; + padding-bottom: 5px; } .note-headline-light { @@ -435,6 +434,11 @@ ul.notes { margin-left: 10px; color: $gray-darkest; + @media (max-width: $screen-xs-max) { + float: none; + margin-left: 0; + } + .note-action-button { margin-left: 8px; } |