diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-25 16:20:13 +0000 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-08 11:55:43 +0000 |
commit | 158e4bdf6831bda9016d7d5a981fb2f0b64e2cb7 (patch) | |
tree | 4c5e9e5fce336e4138c4dcf30411725e38d6f21e /app | |
parent | f9e45bac3213c3d92a9efd6f7a17e5c2c8e4cbe7 (diff) | |
download | gitlab-ce-158e4bdf6831bda9016d7d5a981fb2f0b64e2cb7.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
Diffstat (limited to 'app')
-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 70db1962228..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; - } - } - .system-note { .note-text { color: $gl-text-color !important; |