Merge branch 'next-minor' into develop

Changelog.md

@@ -20,6 +20,7 @@
 * Prevent scroll to top when clicking 'mark all as read' in the notification dropdown [#7253](https://github.com/diaspora/diaspora/pull/7253)
 * Update existing notifications in dropdown on fetch [#7270](https://github.com/diaspora/diaspora/pull/7270)
 * Fix link to post on mobile photo page [#7274](https://github.com/diaspora/diaspora/pull/7274)
+* Fix some background issues on dark mobile themes [#7278](https://github.com/diaspora/diaspora/pull/7278)
 
 ## Features
 * Add links to the aspects and followed tags pages on mobile [#7265](https://github.com/diaspora/diaspora/pull/7265)

app/assets/stylesheets/color_themes/dark/mobile.scss

@@ -43,6 +43,8 @@ body {
   .stream-element.unread { background-color: $gray; }
   .stream-element.read { background-color: $gray-darker; }
 
+  #show_content .photo { border-color: $border-grey; }
+
   .header-full-width { border-bottom: 1px solid $border-grey; }
 
   .user_aspects {

app/assets/stylesheets/mobile/mobile.scss

@@ -281,7 +281,7 @@ footer {
 
   .photo {
     text-align: center;
-    background-color: #FFFFFF;
+    background-color: $framed-background;
     border-style: solid;
     border-width: 1px;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
@@ -733,7 +733,7 @@ select#aspect_ids_ {
 #publisher_textarea_wrapper {
   border-radius: 2px;
   margin: 12px 0px;
-  background: #fff;
+  background: $framed-background;
   position: relative;
   padding-right: 10px;
 
@@ -766,7 +766,7 @@ select#aspect_ids_ {
 
   &.with_attachments {
     padding-bottom: 55px;
-    border: 1px solid #CCCCCC;
+    border: 1px solid $border-medium-grey;
   }
 
   #photodropzone {