Merge branch 'next-minor' into develop

2017-01-03 03:31:56 +01:00 · 2017-01-03 03:31:56 +01:00 · 03ae48c820
commit 03ae48c820
parent 6a1386094a 747ea161bf
2 changed files with 1 additions and 1 deletions
--- a/Changelog.md
+++ b/Changelog.md
@ -12,6 +12,7 @@
 ## Refactor

 ## Bug fixes
+* Fix background color of year on notifications page with dark theme [#7263](https://github.com/diaspora/diaspora/pull/7263)

 ## Features

--- a/app/assets/stylesheets/notifications.scss
+++ b/app/assets/stylesheets/notifications.scss
@ -10,7 +10,6 @@
    .framed-content { padding-bottom: 10px; }

    .year {
-      background-color: $white;
      color: $text-grey;
      font-size: 40px;
      line-height: 40px;