Skip to content

Fix login primary colour and feedback #12495

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.

Sign up for GitHub

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

Jump to bottom
Merged
MorrisJobke merged 1 commit into from
Nov 19, 2018
Merged

Fix login primary colour and feedback #12495

MorrisJobke merged 1 commit into from
Nov 19, 2018

Conversation

@skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented Nov 16, 2018 •
edited
Loading

Fix #12404 (not found)

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

@nextcloud/designers

@skjnldsv skjnldsv added bug design Design, UI, UX, etc. 3. to review Waiting for reviews labels Nov 16, 2018
@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 Compare November 16, 2018 17:28
@ChristophWurst
Copy link
Member

ChristophWurst commented Nov 19, 2018

Conflicting files

core/css/guest.css

FYI

@skjnldsv
Copy link
Member Author

skjnldsv commented Nov 19, 2018

Fixed @ChristophWurst! Thanks :)

@skjnldsv
Copy link
Member Author

skjnldsv commented Nov 19, 2018

Failure unrelated

@juliusknorr
Copy link
Member

juliusknorr commented Nov 19, 2018

@skjnldsv Fixup bot failing 😉 Otherwise fine by me 👍

ChristophWurst
ChristophWurst approved these changes Nov 19, 2018
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

Fine by me

@ChristophWurst
Copy link
Member

ChristophWurst commented Nov 19, 2018

@skjnldsv time to squash those commits!

@ChristophWurst
Copy link
Member

ChristophWurst commented Nov 19, 2018

@fixupbot squash

@skjnldsv @MorrisJobke
Fix login primary colour and feedback
3b16a76 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
@MorrisJobke MorrisJobke force-pushed the login-theming-primary-fix branch from e939728 to 3b16a76 Compare November 19, 2018 12:21
@MorrisJobke
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.

@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 Nov 19, 2018
@ChristophWurst
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
@MorrisJobke MorrisJobke deleted the login-theming-primary-fix branch November 19, 2018 14:26
@MorrisJobke MorrisJobke mentioned this pull request Nov 22, 2018
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@juliusknorr juliusknorr juliusknorr approved these changes

@rullzer rullzer Awaiting requested review from rullzer

@MorrisJobke MorrisJobke Awaiting requested review from MorrisJobke

@jancborchardt jancborchardt Awaiting requested review from jancborchardt

@tobiasKaminsky tobiasKaminsky Awaiting requested review from tobiasKaminsky

@danxuliu danxuliu Awaiting requested review from danxuliu

Assignees

@skjnldsv skjnldsv

Labels

4. to release Ready to be released and/or waiting for tests to finish bug design Design, UI, UX, etc.

Projects

None yet

Milestone

Nextcloud 15

Development

Successfully merging this pull request may close these issues.

5 participants

@skjnldsv @ChristophWurst @juliusknorr @MorrisJobke