summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-04-12 20:56:18 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-04-13 19:48:34 +0800
commit58e53a012fbe317829be29dc856741d0d4550145 (patch)
tree4e8d86043530b4a4c499501a1d595820b303f0dd
parent18fa43da403b1f8117c1586e292c2fb49b931217 (diff)
downloadgitlab-ce-58e53a012fbe317829be29dc856741d0d4550145.tar.gz
Merge branch '30858-system-notes-indent' into 'master'
Indent system notes on desktop screens Closes #30858 See merge request !10667
-rw-r--r--app/assets/stylesheets/pages/notes.scss16
1 files changed, 12 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 94ea4c5c8c6..ad0f2f6efbb 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -18,12 +18,12 @@ ul.notes {
float: left;
svg {
- width: 18px;
- height: 18px;
+ width: 16px;
+ height: 16px;
fill: $gray-darkest;
position: absolute;
- left: 30px;
- top: 15px;
+ left: 0;
+ top: 16px;
}
}
@@ -144,6 +144,10 @@ ul.notes {
padding: 0;
clear: both;
+ @media (min-width: $screen-sm-min) {
+ margin-left: 65px;
+ }
+
&.timeline-entry::after {
clear: none;
}
@@ -172,6 +176,10 @@ ul.notes {
.timeline-content {
padding: 14px 10px;
+
+ @media (min-width: $screen-sm-min) {
+ margin-left: 20px;
+ }
}
.note-header {