Skip to content

LDAP Wizard: primary-style buttons - #5749

Merged
blizzz merged 3 commits into
masterfrom
ldap-primary-buttons
Nov 14, 2017
Merged

LDAP Wizard: primary-style buttons#5749
blizzz merged 3 commits into
masterfrom
ldap-primary-buttons

Conversation

@blizzz

@blizzzblizzz commented Jul 17, 2017•
edited
Loading

Copy link
Copy Markdown
Member

Split off from #5568

⚠️ based on feature branch from #5568

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

jancborchardt commented Aug 12, 2017

Copy link
Copy Markdown
Member

Why use a separate class and not the core class?

@blizzz

blizzz commented Aug 29, 2017•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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)

@juliusknorr

juliusknorr commented Sep 5, 2017

Copy link
Copy Markdown
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
blizzzforce-pushed the ldap-agent-credentials-safe branch from a8c6d07 to a30ff24CompareSeptember 7, 2017 13:29
@blizzz
blizzzforce-pushed the ldap-primary-buttons branch from c705fb6 to f34e546CompareSeptember 7, 2017 13:31
@blizzz

blizzz commented Sep 7, 2017

Copy link
Copy Markdown
MemberAuthor

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

I rebased.

@blizzz
blizzzforce-pushed the ldap-primary-buttons branch from f34e546 to 249bf34CompareSeptember 7, 2017 13:34
@MorrisJobke
MorrisJobkeforce-pushed the ldap-agent-credentials-safe branch from a30ff24 to 7b0868dCompareOctober 27, 2017 12:25
blizzzand 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>
@juliusknorr@blizzz
Use primary class also for ui-button elements
57eb046
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@blizzz
blizzzforce-pushed the ldap-primary-buttons branch from 249bf34 to 57eb046CompareNovember 13, 2017 15:33
@blizzz
blizzz changed the base branch from ldap-agent-credentials-safe to masterNovember 13, 2017 15:33
@blizzz

blizzz commented Nov 13, 2017

Copy link
Copy Markdown
MemberAuthor

Rebased again, and now to master.

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

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

jancborchardt commented Nov 14, 2017

Copy link
Copy Markdown
Member

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

@juliusknorr

juliusknorr commented Nov 14, 2017

Copy link
Copy Markdown
Member

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

@blizzz

blizzz commented Nov 14, 2017

Copy link
Copy Markdown
MemberAuthor

@juliushaertl i am happy about your changes

@blizzz

blizzz commented Nov 14, 2017

Copy link
Copy Markdown
MemberAuthor

Seems fine by me

Interpreting this as 👍 and merging

@blizzz
blizzz merged commit a6d8948 into masterNov 14, 2017
@blizzz
blizzz deleted the ldap-primary-buttons branch November 14, 2017 13:03
@skjnldsv

skjnldsv commented Nov 14, 2017

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

blizzz commented Nov 14, 2017

Copy link
Copy Markdown
MemberAuthor

😁

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

Reviewers

@juliusknorrjuliusknorrjuliusknorr approved these changes
@nickvergessennickvergessenAwaiting requested review from nickvergessen
@rullzerrullzerAwaiting requested review from rullzer
@MorrisJobkeMorrisJobkeAwaiting requested review from MorrisJobke
@jancborchardtjancborchardtAwaiting requested review from jancborchardt
@skjnldsvskjnldsvAwaiting requested review from skjnldsv

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsdesignDesign, UI, UX, etc.enhancementfeature: ldap

Projects

None yet

Milestone

Nextcloud 13

Development

Successfully merging this pull request may close these issues.

4 participants

@blizzz@jancborchardt@juliusknorr@skjnldsv