Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[PLAY-618] Adding secondary action to color tokens #2324

Merged
merged 3 commits into from
Mar 3, 2023
Merged

[PLAY-618] Adding secondary action to color tokens #2324

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d00bc7
Adding secondary action to color tokens
carloslimasd Feb 20, 2023
21054a5
Merge branch 'master' into PLAY-618-secondary-action-token
nidaqg Feb 24, 2023
94d8462
Merge branch 'master' into PLAY-618-secondary-action-token
nidaqg Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions playbook/app/pb_kits/playbook/pb_button/_button_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@ $pb_button_border_width: 0px;

// Secondary ====================
@mixin pb_button_secondary {
@include pb_button_variant(rgba($primary_action, 0.05), $primary_action);
@include pb_button_variant($secondary-action, $primary_action);

@media (hover:hover) {
&:hover {
@include pb_button_hover(rgba($primary_action, $opacity_3));
}
&:active {
transition: none;
@include pb_button_variant(rgba($primary_action, 0.05), $primary_action);
@include pb_button_variant($secondary-action, $primary_action);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion playbook/app/pb_kits/playbook/pb_circle_icon_button/_circle_icon_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $pb_button_styles: [
@mixin pb_circle_icon_button_active {
&:active {
transition: none;
@include pb_button_variant(rgba($primary_action, 0.05), $primary_action);
@include pb_button_variant($secondary-action, $primary_action);
}
}

Expand Down
2 changes: 2 additions & 0 deletions playbook/app/pb_kits/playbook/tokens/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ $card_colors: (
);

$primary-action: $primary !default;
$secondary-action: rgba($primary_action, 0.05) !default;

$action_colors: (
primary_action: $primary-action
);
Expand Down