Upgraded Donut to match the new release of q2a-open-login#110
Open
bertrandgorge wants to merge 7 commits intoamiyasahu:masterfrom
Open
Upgraded Donut to match the new release of q2a-open-login#110bertrandgorge wants to merge 7 commits intoamiyasahu:masterfrom
bertrandgorge wants to merge 7 commits intoamiyasahu:masterfrom
Conversation
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)
Author
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
Owner
|
Can you please remove the commit d0ba662 from this pull request? |
Author
|
Done - sorry for the trouble - I'm still not completely ok with my git processes ! |
Owner
|
Thank you @bertrandgorge, I will test your changes and merge it in the next release. |
|
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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
buttons.less:
header.less:
user-loggedin-drop-down.php:
user-login-drop-down.php: