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

Merged
merged 1 commit into from Nov 19, 2018
Merged

Conversation

@skjnldsv
Copy link
Member

@skjnldsv 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

@ChristophWurst
Copy link
Member

@ChristophWurst ChristophWurst commented Nov 19, 2018

Conflicting files

core/css/guest.css

FYI

@skjnldsv
Copy link
Member Author

@skjnldsv skjnldsv commented Nov 19, 2018

Fixed @ChristophWurst! Thanks :)

@skjnldsv
Copy link
Member Author

@skjnldsv skjnldsv commented Nov 19, 2018

Failure unrelated

@juliushaertl
Copy link
Member

@juliushaertl juliushaertl commented Nov 19, 2018

@skjnldsv Fixup bot failing 😉 Otherwise fine by me 👍

Copy link
Member

@ChristophWurst ChristophWurst left a comment

Fine by me

@ChristophWurst
Copy link
Member

@ChristophWurst ChristophWurst commented Nov 19, 2018

@skjnldsv time to squash those commits!

@ChristophWurst
Copy link
Member

@ChristophWurst ChristophWurst commented Nov 19, 2018

@fixupbot squash

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

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

@ChristophWurst 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
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/drone/pr the build failed
Details
@dco
DCO DCO
Details
@fixupbot
fixupbot No fixup commits found. The commit history is clean
Details
@MorrisJobke MorrisJobke deleted the login-theming-primary-fix branch Nov 19, 2018
@MorrisJobke MorrisJobke mentioned this pull request Nov 22, 2018
7 of 7 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants