Skip to content

Fix login primary colour and feedback - #12495

Merged
MorrisJobke merged 1 commit into
masterfrom
login-theming-primary-fix
Nov 19, 2018
Merged

Fix login primary colour and feedback#12495
MorrisJobke merged 1 commit into
masterfrom
login-theming-primary-fix

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Nov 16, 2018•
edited
Loading

Copy link
Copy Markdown
Member

Fix#12404 (not found)

BeforeAfter
peek 16-11-2018 18-23peek 16-11-2018 18-27

@nextcloud/designers

@skjnldsvskjnldsv added bug design Design, UI, UX, etc. 3. to review Waiting for reviews labels Nov 16, 2018
@skjnldsvskjnldsv added this to the Nextcloud 15 milestone Nov 16, 2018
@skjnldsvskjnldsv self-assigned this Nov 16, 2018
@skjnldsv
skjnldsvforce-pushed the login-theming-primary-fix branch from e490368 to 1c83b11CompareNovember 16, 2018 17:28
@ChristophWurst

ChristophWurst commented Nov 19, 2018

Copy link
Copy Markdown
Member

Conflicting files

core/css/guest.css

FYI

@skjnldsv

skjnldsv commented Nov 19, 2018

Copy link
Copy Markdown
MemberAuthor

Fixed @ChristophWurst! Thanks :)

@skjnldsv

skjnldsv commented Nov 19, 2018

Copy link
Copy Markdown
MemberAuthor

Failure unrelated

@juliusknorr

juliusknorr commented Nov 19, 2018

Copy link
Copy Markdown
Member

@skjnldsv Fixup bot failing 😉 Otherwise fine by me 👍

ChristophWurst
ChristophWurst approved these changes Nov 19, 2018
View reviewed changes

@ChristophWurstChristophWurst left a comment

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.

Fine by me

@ChristophWurst

ChristophWurst commented Nov 19, 2018

Copy link
Copy Markdown
Member

@skjnldsv time to squash those commits!

@ChristophWurst

ChristophWurst commented Nov 19, 2018

Copy link
Copy Markdown
Member

@fixupbot squash

@skjnldsv@MorrisJobke
Fix login primary colour and feedback
3b16a76
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@MorrisJobke
MorrisJobkeforce-pushed the login-theming-primary-fix branch from e939728 to 3b16a76CompareNovember 19, 2018 12:21
@MorrisJobke

MorrisJobke commented Nov 19, 2018

Copy link
Copy Markdown
Member

I manually squashed because there were conflicts that where resolved by the merge, but due to the rebase the merge vanished.

@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 Nov 19, 2018
@ChristophWurst

ChristophWurst commented Nov 19, 2018

Copy link
Copy Markdown
Member

I manually squashed because there were conflicts that where resolved by the merge, but due to the rebase the merge vanished.

FYI #12495 (comment) was a joke. That bot does not yet support that 😉

@MorrisJobke
MorrisJobke merged commit 7ea7eb0 into masterNov 19, 2018
@MorrisJobke
MorrisJobke deleted the login-theming-primary-fix branch November 19, 2018 14:26
@MorrisJobkeMorrisJobke mentioned this pull request Nov 22, 2018
Merged
7 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst approved these changes
@juliusknorrjuliusknorrjuliusknorr approved these changes
@rullzerrullzerAwaiting requested review from rullzer
@MorrisJobkeMorrisJobkeAwaiting requested review from MorrisJobke
@jancborchardtjancborchardtAwaiting requested review from jancborchardt
@tobiasKaminskytobiasKaminskyAwaiting requested review from tobiasKaminsky
@danxuliudanxuliuAwaiting requested review from danxuliu

Assignees

@skjnldsvskjnldsv

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugdesignDesign, UI, UX, etc.

Projects

None yet

Milestone

Nextcloud 15

Development

Successfully merging this pull request may close these issues.

4 participants

@skjnldsv@ChristophWurst@juliusknorr@MorrisJobke