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 login primary colour and feedback #12495

Merged
merged 1 commit into from Nov 19, 2018

Conversation

@skjnldsv
Copy link
Member

skjnldsv commented Nov 16, 2018

Fix #12404 (not found)

Before After
peek 16-11-2018 18-23 peek 16-11-2018 18-27

@nextcloud/designers

@skjnldsv skjnldsv added this to the Nextcloud 15 milestone Nov 16, 2018

@skjnldsv skjnldsv self-assigned this Nov 16, 2018

@skjnldsv skjnldsv force-pushed the login-theming-primary-fix branch from e490368 to 1c83b11 Nov 16, 2018

@ChristophWurst

This comment has been minimized.

Copy link
Member

ChristophWurst commented Nov 19, 2018

Conflicting files

core/css/guest.css

FYI

@skjnldsv

This comment has been minimized.

Copy link
Member

skjnldsv commented Nov 19, 2018

Fixed @ChristophWurst! Thanks :)

@skjnldsv

This comment has been minimized.

Copy link
Member

skjnldsv commented Nov 19, 2018

Failure unrelated

@juliushaertl

This comment has been minimized.

Copy link
Member

juliushaertl commented Nov 19, 2018

@skjnldsv Fixup bot failing 😉 Otherwise fine by me 👍

@ChristophWurst
Copy link
Member

ChristophWurst left a comment

Fine by me

@ChristophWurst

This comment has been minimized.

Copy link
Member

ChristophWurst commented Nov 19, 2018

@skjnldsv time to squash those commits!

@ChristophWurst

This comment has been minimized.

Copy link
Member

ChristophWurst commented Nov 19, 2018

@fixupbot squash

Fix login primary colour and feedback
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

@MorrisJobke MorrisJobke force-pushed the login-theming-primary-fix branch from e939728 to 3b16a76 Nov 19, 2018

@MorrisJobke

This comment has been minimized.

Copy link
Member

MorrisJobke commented Nov 19, 2018

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

@ChristophWurst

This comment has been minimized.

Copy link
Member

ChristophWurst commented Nov 19, 2018

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

1 check failed

continuous-integration/drone/pr the build failed
Details

@MorrisJobke MorrisJobke deleted the login-theming-primary-fix branch Nov 19, 2018

@MorrisJobke MorrisJobke referenced this pull request Nov 22, 2018

Merged

15.0.0 RC 1 #12581

7 of 7 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment