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.

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

LDAP Wizard: primary-style buttons #5749

Merged
merged 3 commits into from
Nov 14, 2017
Merged

LDAP Wizard: primary-style buttons #5749

merged 3 commits into from
Nov 14, 2017

Conversation

blizzz
Copy link
Member

@blizzz blizzz commented Jul 17, 2017 •
edited
Loading

Split off from #5568

⚠️ based on feature branch from #5568

@blizzz blizzz added 2. developing Work in progress design Design, UI, UX, etc. enhancement feature: ldap labels Jul 17, 2017
@blizzz blizzz added this to the Nextcloud 13 milestone Jul 17, 2017
@blizzz blizzz mentioned this pull request Jul 17, 2017
Merged
@jancborchardt
Copy link
Member

Why use a separate class and not the core class?

@blizzz
Copy link
Member Author

blizzz commented Aug 29, 2017 •
edited
Loading

Why use a separate class and not the core class?

IIRC it does not work with jQ Ui. Some stuff is overwritten, or it looks horrible (or both).

P.S.: Cf. #5568 (comment)

@juliushaertl
Copy link
Member

@blizzz I've added a commit to provide the primary style also for jquery ui buttons. That should work fine now since we have migrated the jquery-ui-fixes to SCSS as well in #6341

@blizzz
Copy link
Member Author

blizzz commented Sep 7, 2017

@juliushaertl awesome, thanks! That's much better.

I rebased.

blizzz and others added 2 commits November 13, 2017 16:33
@blizzz
hackishly add primary css class adaption for jquery ui
5603d9a 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@juliushaertl @blizzz
Use primary class also for ui-button elements
57eb046 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@blizzz blizzz changed the base branch from ldap-agent-credentials-safe to master November 13, 2017 15:33
@blizzz
Copy link
Member Author

blizzz commented Nov 13, 2017

Rebased again, and now to master.

Want to have it in? @jancborchardt @skjnldsv @nextcloud/ldap ?

@blizzz blizzz added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 13, 2017
@blizzz
add newline at the end of the ~~universe~~ file
f575060 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@jancborchardt
Copy link
Member

Seems fine by me. @juliushaertl @skjnldsv what do you think?

@juliushaertl
Copy link
Member

Fine by me, but I would like to have another reviewer since i committed the primary class use.

@blizzz
Copy link
Member Author

blizzz commented Nov 14, 2017

@juliushaertl i am happy about your changes

@blizzz
Copy link
Member Author

blizzz commented Nov 14, 2017

Seems fine by me

Interpreting this as 👍 and merging

@blizzz blizzz merged commit a6d8948 into master Nov 14, 2017
@blizzz blizzz deleted the ldap-primary-buttons branch November 14, 2017 13:03
@skjnldsv
Copy link
Member

Seems fine by me. @juliushaertl @skjnldsv what do you think?

I did not have enough time to review! @blizzz is the fastest merger of the far west! 🔫 😆

@blizzz
Copy link
Member Author

blizzz commented Nov 14, 2017

😁

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliushaertl juliushaertl juliushaertl approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@rullzer rullzer Awaiting requested review from rullzer

@MorrisJobke MorrisJobke Awaiting requested review from MorrisJobke

@jancborchardt jancborchardt Awaiting requested review from jancborchardt

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees
No one assigned
Labels
3. to review Waiting for reviews design Design, UI, UX, etc. enhancement feature: ldap
Projects
None yet
Milestone
Nextcloud 13
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@blizzz @jancborchardt @juliushaertl @skjnldsv