Skip to content

Commit

Permalink
swap activated for selected
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonreid committed Aug 4, 2023
1 parent a6f8387 commit a0bc200
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions src/components/Button/PButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,9 @@
.p-button--selected,
.p-button--selected:not(:disabled):hover,
.p-button--selected:not(:disabled):active {
background-color: var(--p-color-button-activated-bg);
border-color: var(--p-color-button-activated-border);
color: var(--p-color-button-activated-text);
background-color: var(--p-color-button-selected-bg);
border-color: var(--p-color-button-selected-border);
color: var(--p-color-button-selected-text);
cursor: default;
}
</style>
6 changes: 3 additions & 3 deletions src/components/DatePicker/ScrollingPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@
.scrolling-picker__option--selected:not(:disabled):hover,
.scrolling-picker__option--selected:not(:disabled):active { @apply
cursor-default;
background-color: var(--p-color-button-activated-bg);
border-color: var(--p-color-button-activated-border);
color: var(--p-color-button-activated-text);
background-color: var(--p-color-button-selected-bg);
border-color: var(--p-color-button-selected-border);
color: var(--p-color-button-selected-text);
}
.scrolling-picker__option--disabled { @apply
Expand Down
2 changes: 1 addition & 1 deletion src/components/DateRangeInput/PDateRangeInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
.p-date-range-input__date--in-range:not(.p-date-range-input__date--selected),
.p-date-range-input__date--in-range:not(.p-date-range-input__date--selected):hover { @apply
bg-to-active-hover
bg-selectable-hover
}
.p-date-range-input__date--out-of-month:not(:disabled) { @apply
Expand Down
12 changes: 6 additions & 6 deletions src/styles/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,9 @@
--p-color-button-flat-danger-border-active: var(--p-color-button-flat-danger-border-hover);
--p-color-button-flat-danger-text-active: var(--p-color-button-flat-danger-text-hover);

--p-color-button-activated-bg: var(--p-color-selected);
--p-color-button-activated-border: transparent;
--p-color-button-activated-text: var(--p-color-text-default);
--p-color-button-selected-bg: var(--p-color-selected);
--p-color-button-selected-border: transparent;
--p-color-button-selected-text: var(--p-color-text-default);

/* Legacy Tokens – To be removed before releasing version 2.0 */
--foreground: var(--200);
Expand Down Expand Up @@ -447,9 +447,9 @@
--p-color-button-flat-danger-border-active: var(--p-color-button-flat-danger-border-hover);
--p-color-button-flat-danger-text-active: var(--p-color-button-flat-danger-text-hover);

--p-color-button-activated-bg: var(--p-color-selected);
--p-color-button-activated-border: transparent;
--p-color-button-activated-text: var(--p-color-text-default);
--p-color-button-selected-bg: var(--p-color-selected);
--p-color-button-selected-border: transparent;
--p-color-button-selected-text: var(--p-color-text-default);

/* Legacy Tokens – To be removed before releasing version 2.0 */
--foreground: var(--800);
Expand Down

0 comments on commit a0bc200

Please sign in to comment.