Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix email buttons for white theme #7427

Merged
merged 1 commit into from
Dec 11, 2017
Merged

Conversation

MorrisJobke
Copy link
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
Member Author

cc @nextcloud/theming

@MorrisJobke
Copy link
Member Author

We maybe should backport this to stable12.

@MorrisJobke MorrisJobke mentioned this pull request Dec 8, 2017
28 tasks
@rullzer
Copy link
Member

rullzer commented Dec 11, 2017

Failing tests

@MorrisJobke
Copy link
Member Author

Failing tests

Fixed.

@codecov
Copy link

codecov bot commented Dec 11, 2017

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 Files Coverage Δ Complexity Δ
apps/theming/lib/ThemingDefaults.php 0% <0%> (-91.43%) 48 <2> (+1)
lib/private/legacy/defaults.php 0% <0%> (-49.04%) 46 <2> (+2)
apps/theming/lib/Capabilities.php 0% <0%> (-81.82%) 3 <0> (-1)
lib/private/Mail/EMailTemplate.php 0% <0%> (-59.85%) 43 <0> (ø)
lib/public/Defaults.php 0% <0%> (-15.79%) 20 <1> (+1)
...eware/Security/Exceptions/NotLoggedInException.php 0% <0%> (-100%) 1% <0%> (ø)
apps/encryption/lib/Session.php 0% <0%> (-100%) 21% <0%> (ø)
apps/dav/lib/Files/Sharing/FilesDropPlugin.php 0% <0%> (-100%) 6% <0%> (ø)
lib/private/Diagnostics/EventLogger.php 0% <0%> (-100%) 9% <0%> (ø)
lib/private/BackgroundJob/QueuedJob.php 0% <0%> (-100%) 1% <0%> (ø)
... and 853 more

@MorrisJobke MorrisJobke 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
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish feature: theming
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants