summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Rose <sam@gitlab.com>2017-05-03 08:15:12 -0400
committerSam Rose <sam@gitlab.com>2017-05-03 18:36:33 -0400
commit0d59a51dfee2ce432356bf2fd2888bce685f1ed8 (patch)
tree30ad714ab5179bbd9f6798c482358fb98059e4b9
parent4faa65d8381f3e1e45bdf3a9bc9785b588891b66 (diff)
downloadgitlab-ce-31727-timestamps-in-merge-request-discussion-overflow-role-badge.tar.gz
Wrap note actions below timestamp on discussions31727-timestamps-in-merge-request-discussion-overflow-role-badge
-rw-r--r--app/assets/stylesheets/pages/notes.scss14
1 files changed, 13 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index f89150ebead..259bc09b997 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -111,9 +111,12 @@ ul.notes {
}
.note-header {
- padding-bottom: 8px;
padding-right: 20px;
+ & > div {
+ padding-bottom: 8px;
+ }
+
@media (min-width: $screen-sm-min) {
padding-right: 0;
}
@@ -365,6 +368,10 @@ ul.notes {
.note-header {
display: flex;
justify-content: space-between;
+
+ @media (max-width: $screen-xs-max) {
+ flex-flow: row wrap;
+ }
}
.note-header-info {
@@ -416,6 +423,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;
}