summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-29 05:18:58 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-29 05:18:58 +0000
commit9e8fdead1789b425152256ec977241e7f19123ce (patch)
treed2184692610dde9098bad963cca9bbdbf5b9e755
parent9c2fbcb06497eef2fc53026ebb419e74d7a2be2c (diff)
parentd9584ec7e03aa8ee33a6212dbbc13ef2b47b781b (diff)
downloadgitlab-ce-9e8fdead1789b425152256ec977241e7f19123ce.tar.gz
Merge branch '17295_discussion_note' into 'master'
Fixes missing avatar on system notes Closes #17295 ![Screen_Shot_2016-06-27_at_12.50.50_PM](/uploads/b142226e608ccfe751a9b6059f57c9ec/Screen_Shot_2016-06-27_at_12.50.50_PM.jpg) See merge request !4954
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/pages/notes.scss4
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5c735bd1420..27dd8708559 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ v 8.9.3 (unreleased)
- Decreased min width of screen to 1280px for pinned sidebar
- Fix encrypted data backwards compatibility after upgrading attr_encrypted gem
- Update mobile button icons to be more inline with typical UI paradigms
+ - Fixes missing avatar on system notes. !4954
v 8.9.2
- Fix visibility of snippets when searching.
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index ee7c98f805b..ac8c02b59dc 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -41,6 +41,10 @@ ul.notes {
.timeline-icon {
.avatar {
visibility: hidden;
+
+ .discussion-body & {
+ visibility: visible;
+ }
}
}
}