Skip to content

[stable12] Fix email buttons for white theme - #7558

Merged
MorrisJobke merged 1 commit into
stable12from
12-7427
Dec 18, 2017
Merged

[stable12] Fix email buttons for white theme#7558
MorrisJobke merged 1 commit into
stable12from
12-7427

Conversation

@MorrisJobke

Copy link
Copy Markdown
Member

Backport of #7427
Fixes#7557 for stable12

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobkeMorrisJobke added the 3. to review Waiting for reviews label Dec 18, 2017
@MorrisJobkeMorrisJobke added this to the Nextcloud 12.0.5 milestone Dec 18, 2017
@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

I just tested this and it works fine 👍

/**
* Returns primary color
* @return string
* @since 13.0.0

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

back to the future?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes - but I just don't want to change it all the way - for this single time it is a bit off, but shouldn't hurt or does it? Because adding "since 12.0.5" doesn't add that much.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. No app should really depend on it anyways as it isn't available in 12 in general.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@codecov

codecovBot commented Dec 18, 2017

Copy link
Copy Markdown

Codecov Report

Merging #7558 into stable12 will decrease coverage by <.01%.
The diff coverage is 60%.

@@ Coverage Diff @@## stable12 #7558 +/- ##
==============================================
- Coverage 53.93% 53.93% -0.01% - Complexity 22705 22708 +3 
==============================================
Files 1385 1385 Lines 86978 86986 +8 Branches 1330 1330 ==============================================
+ Hits 46914 46916 +2 - Misses 40064 40070 +6
Impacted FilesCoverage ΔComplexity Δ
lib/public/Defaults.php15% <0%> (-0.79%)20 <1> (+1)
apps/theming/lib/ThemingDefaults.php89.25% <100%> (+0.73%)39 <2> (+1)⬆️
lib/private/Mail/EMailTemplate.php60.76% <100%> (+0.61%)41 <0> (ø)⬇️
apps/theming/lib/Capabilities.php80% <100%> (ø)3 <0> (-1)⬇️
lib/private/legacy/defaults.php41.96% <20%> (-1.03%)47 <2> (+2)
apps/files_trashbin/lib/Expiration.php90.32% <0%> (-1.62%)29% <0%> (ø)

@MorrisJobke
MorrisJobke merged commit 6859e5a into stable12Dec 18, 2017
@MorrisJobke
MorrisJobke deleted the 12-7427 branch December 18, 2017 20:19
@MorrisJobkeMorrisJobke mentioned this pull request Jan 8, 2018
13 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@MorrisJobke@rullzer@blizzz