-
Notifications
You must be signed in to change notification settings - Fork 32
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
New: 'is-locked' btn class added #209
Merged
joe-allen-89
merged 1 commit into
master
from
separating-locked-from-inactive-disabled-buttons
Feb 5, 2024
Merged
New: 'is-locked' btn class added #209
joe-allen-89
merged 1 commit into
master
from
separating-locked-from-inactive-disabled-buttons
Feb 5, 2024
Conversation
This file contains 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
hbs 'is-disabled' btn class isn't needed. This is handled via [TrickleButtonView.js line 122](https://github.com/adaptlearning/adapt-contrib-trickle/blob/82a1c23f24f6508d6ed8c0a65e23ddb11ae9d8ad/js/TrickleButtonView.js#L122).
cahirodoherty-learningpool
approved these changes
Jan 24, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👀
kirsty-hames
changed the title
New: Toggle 'is-locked' btn class and remove hbs 'is-disabled' btn class
New: 'is-locked' btn class added
Jan 25, 2024
zubairslamdien
approved these changes
Jan 30, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
lemmyadams
approved these changes
Feb 2, 2024
joe-allen-89
deleted the
separating-locked-from-inactive-disabled-buttons
branch
February 5, 2024 09:59
github-actions bot
pushed a commit
that referenced
this pull request
Feb 5, 2024
# [7.1.0](v7.0.2...v7.1.0) (2024-02-05) ### New * toggle 'is-locked' btn class and remove hbs 'is-disabled' btn class (#209) ([fe5baa1](fe5baa1)), closes [#209](#209) [/github.com/adaptlearning/adapt-contrib-trickle/blob/82a1c23f24f6508d6ed8c0a65e23ddb11ae9d8ad/js/TrickleButtonView.js#L122](https://github.com//github.com/adaptlearning/adapt-contrib-trickle/blob/82a1c23f24f6508d6ed8c0a65e23ddb11ae9d8ad/js/TrickleButtonView.js/issues/L122)
🎉 This PR is included in version 7.1.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
kirsty-hames
added a commit
to adaptlearning/adapt-contrib-vanilla
that referenced
this pull request
Mar 12, 2024
following PR merge, 'is-locked' btn class added - adaptlearning/adapt-contrib-trickle#209
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add
.is-locked
state classRelates to Core issue to allow for locked and inactive disabled buttons to be visually different. Depending on the button context, the appropriate
.is-locked
or.is-disabled
classes should be used..is-locked
- applies to buttons that are temporarily disabled due to step locked content..is-disabled
- applies to buttons with functionality not available.There are no specific Trickle button styles currently. Colours inherit from Vanilla
.btn-text
and.btn-icon
classes instead which already include .is-locked so no further styling required..btn-text
and.btn-icon
locked states inherit from the disabled state by default so there will be no visual changes. By introducing.is-locked
class, this gives the flexibility of setting locked styling that can differ from the standard disabled styling.Remove hbs 'is-disabled' btn class
The toggling of
.is-disabled
btn class is handled viatoggleEnabled
in TrickleButtonView.js. The hbs.is-disabled
btn class had no impact on this so I've removed as this might cause confusion as to where the classes are applied.