Skip to content

Fix email buttons for white theme - #7427

Merged
MorrisJobke merged 1 commit into
masterfrom
fix-white-color-in-emails
Dec 11, 2017
Merged

Fix email buttons for white theme#7427
MorrisJobke merged 1 commit into
masterfrom
fix-white-color-in-emails

Conversation

@MorrisJobke

Copy link
Copy Markdown
Member

If the theming app has set the color set to white the button in the emails where white with white text. This fixes that and introduces the getTextColorPrimary to the defaults interface to make the color calculation consistent.

bildschirmfoto 2017-12-08 um 12 11 31

bildschirmfoto 2017-12-08 um 12 15 40

@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

cc @nextcloud/theming

@MorrisJobke
MorrisJobkeforce-pushed the fix-white-color-in-emails branch from b2c197f to 40fff71CompareDecember 8, 2017 11:25
@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

We maybe should backport this to stable12.

@MorrisJobkeMorrisJobke mentioned this pull request Dec 8, 2017
28 tasks
@rullzer

Copy link
Copy Markdown
Member

Failing tests

@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

Failing tests

Fixed.

@MorrisJobke
MorrisJobkeforce-pushed the fix-white-color-in-emails branch from 40fff71 to 41934d5CompareDecember 11, 2017 13:09
@codecov

codecovBot commented Dec 11, 2017

Copy link
Copy Markdown

Codecov Report

Merging #7427 into master will decrease coverage by 44.38%.
The diff coverage is 0%.

@@ Coverage Diff @@## master #7427 +/- ##
============================================
- Coverage 50.97% 6.59% -44.39% - Complexity 24735 24738 +3 
============================================
Files 1586 1586 Lines 94257 94265 +8 Branches 1365 1365 ============================================
- Hits 48049 6215 -41834 - Misses 46208 88050 +41842
Impacted FilesCoverage ΔComplexity Δ
apps/theming/lib/ThemingDefaults.php0% <0%> (-91.43%)48 <2> (+1)
lib/private/legacy/defaults.php0% <0%> (-49.04%)46 <2> (+2)
apps/theming/lib/Capabilities.php0% <0%> (-81.82%)3 <0> (-1)
lib/private/Mail/EMailTemplate.php0% <0%> (-59.85%)43 <0> (ø)
lib/public/Defaults.php0% <0%> (-15.79%)20 <1> (+1)
...eware/Security/Exceptions/NotLoggedInException.php0% <0%> (-100%)1% <0%> (ø)
apps/encryption/lib/Session.php0% <0%> (-100%)21% <0%> (ø)
apps/dav/lib/Files/Sharing/FilesDropPlugin.php0% <0%> (-100%)6% <0%> (ø)
lib/private/Diagnostics/EventLogger.php0% <0%> (-100%)9% <0%> (ø)
lib/private/BackgroundJob/QueuedJob.php0% <0%> (-100%)1% <0%> (ø)
... and 853 more

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 11, 2017
@MorrisJobke
MorrisJobkeforce-pushed the fix-white-color-in-emails branch from 41934d5 to 3af04e9CompareDecember 11, 2017 13:22
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishfeature: theming

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@MorrisJobke@rullzer@skjnldsv