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

Upgraded Donut to match the new release of q2a-open-login #110

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

bertrandgorge
Copy link

buttons.less:

  • Added a button-unlink (to remove login providers), with a white times sign in a red button
  • Removed a trailing comma that was making lint not happy

header.less:

  • Added a specific class to distinguish between user menu regular items and login buttons (the css was being mixed up)

user-loggedin-drop-down.php:

user-login-drop-down.php:

  • Removed all additional classes added to login buttons, because q2a-open-login does everything on its own now, with more providers, using bootstrap-social
  • Added a specific class to distinguish between user menu regular items and login buttons (the css was being mixed up)

buttons.less:
* Added a button-unlink (to remove login providers), with a white times sign in a red button
* Removed a trailing comma that was making lint not happy

header.less:
* Added a specific class to distinguish between user menu regular items and login buttons (the css was being mixed up)

user-loggedin-drop-down.php:
* Added a specific class to distinguish between user menu regular items and login buttons (the css was being mixed up)
* Added a test when showing the logout button, because in some case the label already contains the logout link, so it was creating a bizare double menu (see https://www.question2answer.org/qa/65340/two-logout-buttons-displayed-open-login-plugin-look-screen?show=65340#q65340) - see issue amiyasahu#109

user-login-drop-down.php:
* Removed all additional classes added to login buttons, because q2a-open-login does everything on its own now, with more providers, using bootstrap-social
* Added a specific class to distinguish between user menu regular items and login buttons (the css was being mixed up)
@bertrandgorge
Copy link
Author

See : alixandru/q2a-open-login#87

@amiyasahu
Copy link
Owner

Thank you @bertrandgorge for the PR. I will have a look at this.

…t outside the Q2A folder

In case you pull Donut in a separate directory, then build a symbolic link of the plugin and the theme into q2a, two defines would break the code because they would refer to the original checkout dir and not q2a. By using Q2A already defined constants we can work around this issue.

Fixes issue amiyasahu#111
@amiyasahu
Copy link
Owner

amiyasahu commented Mar 10, 2020

Can you please remove the commit d0ba662 from this pull request?

@bertrandgorge
Copy link
Author

Done - sorry for the trouble - I'm still not completely ok with my git processes !

@amiyasahu
Copy link
Owner

Thank you @bertrandgorge, I will test your changes and merge it in the next release.

@Calinou
Copy link

Calinou commented Oct 16, 2020

When you have some time, could you look at resolving merge conflicts, please? We need this PR to update an old Q2A instance to the latest version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants