diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-25 16:20:13 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-25 16:20:13 +0000 |
commit | 0fccbdbc69121957c020eb8a56e4decb62ace596 (patch) | |
tree | 97ec471ebbf45fe4bfef4fda16c2ed2a449cd16a | |
parent | 516e3532c68fb8f40fee083039e711cd6bb8c78c (diff) | |
parent | e2f4e288e64b04242b045906bb40de78415f3eaa (diff) | |
download | gitlab-ce-0fccbdbc69121957c020eb8a56e4decb62ace596.tar.gz |
Merge branch 'add-back-margin-to-note-text' into 'master'
Remove 0 margin bottom for last paragraph on note text
See merge request !11699
-rw-r--r-- | app/assets/stylesheets/framework/timeline.scss | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss index 1fd734d279b..ddccfc96819 100644 --- a/app/assets/stylesheets/framework/timeline.scss +++ b/app/assets/stylesheets/framework/timeline.scss @@ -3,12 +3,6 @@ margin: 0; padding: 0; - .note-text { - p:last-child { - margin-bottom: 0 !important; - } - } - .system-note { .note-text { color: $gl-text-color !important; |