From 0c0b618a8bb041655e785059f288f58ab71514b7 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sat, 14 Jan 2017 03:52:07 +0100
Subject: [PATCH 1/2] Fix background on mobile photo page with dark theme

---
 app/assets/stylesheets/color_themes/dark/mobile.scss | 2 ++
 app/assets/stylesheets/mobile/mobile.scss            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/color_themes/dark/mobile.scss b/app/assets/stylesheets/color_themes/dark/mobile.scss
index 39846a50b..3f10c1483 100644
--- a/app/assets/stylesheets/color_themes/dark/mobile.scss
+++ b/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 {
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index 1b16f4d09..09c112a7c 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/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);

From f671bebd04b2c9fc197701bf707b66fbd45e433d Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sat, 14 Jan 2017 04:00:43 +0100
Subject: [PATCH 2/2] Fix background on mobile photo upload with dark theme

closes #7278
---
 Changelog.md                              | 1 +
 app/assets/stylesheets/mobile/mobile.scss | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index deecb2489..2c4896ef7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,6 +11,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)
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index 09c112a7c..e078bf234 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -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 {