summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-04-24 12:41:08 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-04-25 08:33:15 -0500
commitd563654ec3bbb67e8a58df573291ca942b32e495 (patch)
tree457c5fa8e55f5d0067685f11319aa6199340643c
parente6b777dafe26fe38396aca143b2ca92e073f52ac (diff)
downloadgitlab-ce-27827-cleanup-markdown.tar.gz
Reduce image margin; show all system note icons27827-cleanup-markdown
-rw-r--r--app/assets/stylesheets/framework/typography.scss2
-rw-r--r--app/assets/stylesheets/pages/notes.scss12
2 files changed, 1 insertions, 13 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 76d1adee3f2..96d8a812723 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -8,7 +8,7 @@
img {
max-width: 100%;
- margin: 0 0 $gl-padding;
+ margin: 0 0 8px;
}
p a:not(.no-attachment-icon) img {
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 68bb90f39ed..69a95db6920 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -254,18 +254,6 @@ ul.notes {
}
}
}
-
- .timeline-icon {
- display: none;
-
- .avatar {
- visibility: hidden;
-
- .discussion-body & {
- visibility: visible;
- }
- }
- }
}
}