Skip to content

Commit

Permalink
Beta::Button CSS bug fixes (#1427)
Browse files Browse the repository at this point in the history
* fine tune button fixes

* Create tough-bags-double.md
  • Loading branch information
langermank authored and jonrohan committed Sep 30, 2022
1 parent c7b2c11 commit 2fe773b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 25 deletions.
5 changes: 5 additions & 0 deletions .changeset/tough-bags-double.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/view-components": patch
---

Beta::Button CSS bug fixes
38 changes: 13 additions & 25 deletions app/components/primer/beta/button.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
justify-content: space-between;
align-items: center;
gap: var(--primer-control-medium-gap, 8px);
min-width: max-content;

/* mobile friendly sizing */
@media (pointer: course) {
Expand All @@ -41,13 +42,11 @@
transition-duration: var(--primer-duration-fast);
}

&:active,
&.Button--active {
&:active {
transition: none;
}

&:disabled,
&.Button--disabled,
&[aria-disabled='true'] {
cursor: not-allowed;
box-shadow: none;
Expand Down Expand Up @@ -167,7 +166,7 @@ summary.Button {
border-color: var(--color-btn-primary-border);
box-shadow: var(--color-btn-primary-shadow), var(--color-btn-primary-inset-shadow);

&:hover {
&:hover:not(:disabled) {
background-color: var(--color-btn-primary-hover-bg);
border-color: var(--color-btn-primary-hover-border);
}
Expand All @@ -188,15 +187,13 @@ summary.Button {
@mixin focusOutlineOnEmphasis;
}

&:active,
&[aria-pressed='true'],
&.Button--pressed {
&:active:not(:disabled),
&[aria-pressed='true'] {
background-color: var(--color-btn-primary-selected-bg);
box-shadow: var(--color-btn-primary-selected-shadow);
}

&:disabled,
&.Button--disabled,
&[aria-disabled='true'] {
color: var(--color-btn-primary-disabled-text);
background-color: var(--color-btn-primary-disabled-bg);
Expand All @@ -213,25 +210,22 @@ summary.Button {
border-color: var(--color-btn-border);
box-shadow: var(--color-btn-shadow), var(--color-btn-inset-shadow);

&:hover {
&:hover:not(:disabled) {
background-color: var(--color-btn-hover-bg);
border-color: var(--color-btn-hover-border);
}

&:active,
&.Button--active {
&:active:not(:disabled) {
background-color: var(--color-btn-active-bg);
border-color: var(--color-btn-active-border);
}

&[aria-pressed='true'],
&.Button--pressed {
&[aria-pressed='true'] {
background-color: var(--color-btn-selected-bg);
box-shadow: var(--color-primer-shadow-inset);
}

&:disabled,
&.Button--disabled,
&[aria-disabled='true'] {
color: var(--color-primer-fg-disabled);
background-color: var(--color-btn-bg);
Expand All @@ -243,19 +237,16 @@ summary.Button {
.Button--invisible {
color: var(--color-btn-text);

&:hover {
&:hover:not(:disabled) {
background-color: var(--color-action-list-item-default-hover-bg);
}

&[aria-pressed='true'],
&:active,
&.Button--active,
&.Button--pressed {
&:active:not(:disabled) {
background-color: var(--color-action-list-item-default-active-bg);
}

&:disabled,
&.Button--disabled,
&[aria-disabled='true'] {
color: var(--color-primer-fg-disabled);
background-color: var(--color-btn-bg);
Expand Down Expand Up @@ -291,7 +282,6 @@ summary.Button {
}

&:disabled,
&.Button--disabled,
&[aria-disabled='true'] {
color: var(--color-primer-fg-disabled);
background-color: transparent;
Expand All @@ -308,17 +298,16 @@ summary.Button {
border-color: var(--color-btn-border);
box-shadow: var(--color-btn-shadow), var(--color-btn-inset-shadow);

&:hover {
&:hover:not(:disabled) {
color: var(--color-btn-danger-hover-text);
fill: var(--color-btn-danger-hover-text);
background-color: var(--color-btn-danger-hover-bg);
border-color: var(--color-btn-danger-hover-border);
box-shadow: var(--color-btn-danger-hover-shadow), var(--color-btn-danger-hover-inset-shadow);
}

&:active,
&[aria-pressed='true'],
&.Button--pressed {
&:active:not(:disabled),
&[aria-pressed='true'] {
color: var(--color-btn-danger-selected-text);
fill: var(--color-btn-danger-selected-text);
background-color: var(--color-btn-danger-selected-bg);
Expand All @@ -327,7 +316,6 @@ summary.Button {
}

&:disabled,
&.disabled,
&[aria-disabled='true'] {
color: var(--color-btn-danger-disabled-text);
fill: var(--color-btn-danger-disabled-text);
Expand Down

0 comments on commit 2fe773b

Please sign in to comment.