Skip to content
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

fix(button): change border value to match design #577

Merged
merged 1 commit into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/eight-dogs-kneel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@igloo-ui/button": patch
---

change the border value to render on base 10 and 16.
12 changes: 7 additions & 5 deletions packages/Button/src/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
--ids-btn-height: #{tokens.$space-6};
--ids-btn-height-small: #{tokens.$space-5};
--ids-btn-padding: #{tokens.$space-3};
--ids-btn-border-width: 0.1rem;
--ids-btn-border-radius: #{tokens.$border-radius-sm};
--ids-btn-icon-color: currentcolor;
--ids-btn-icon-margin: #{tokens.$space-1};
Expand Down Expand Up @@ -102,6 +103,7 @@
--ids-btn-height: 2.5rem;
--ids-btn-height-small: 2rem;
--ids-btn-padding: var(--hop-space-inset-md);
--ids-btn-border-width: 0.0625rem;
--ids-btn-border-radius: var(--hop-shape-rounded-md);
--ids-btn-icon-color: currentcolor;
--ids-btn-icon-margin: var(--hop-space-inline-xs);
Expand Down Expand Up @@ -223,7 +225,7 @@
font-weight: var(--ids-btn-font-weight);
color: var(--ids-btn-text-primary);
background: var(--ids-btn-background-primary);
border: .1rem solid var(--ids-btn-border-primary);
border: var(--ids-btn-border-width) solid var(--ids-btn-border-primary);
border-radius: var(--ids-btn-border-radius);
width: 100%;
height: var(--ids-btn-height);
Expand Down Expand Up @@ -346,19 +348,19 @@
%btn-secondary-disabled {
color: var(--ids-btn-text-secondary-disabled);
background: var(--ids-btn-background-secondary-disabled);
border: .1rem solid var(--ids-btn-background-secondary-disabled);
border: var(--ids-btn-border-width) solid var(--ids-btn-background-secondary-disabled);
}

.ids-btn--secondary {
color: var(--ids-btn-text-secondary);
background: var(--ids-btn-background-secondary);
border: .1rem solid var(--ids-btn-border-secondary);
border: var(--ids-btn-border-width) solid var(--ids-btn-border-secondary);
}

.ids-btn--secondary.ids-btn--active {
color: var(--ids-btn-text-secondary-active);
background: var(--ids-btn-background-secondary-active);
border: .1rem solid var(--ids-btn-border-secondary-active);
border: var(--ids-btn-border-width) solid var(--ids-btn-border-secondary-active);
}

.ids-btn--secondary:disabled {
Expand All @@ -371,7 +373,7 @@
.ids-btn--secondary.ids-btn--active:hover {
color: var(--ids-btn-text-secondary-hover);
background: var(--ids-btn-background-secondary-hover);
border: .1rem solid var(--ids-btn-border-secondary-hover);
border: var(--ids-btn-border-width) solid var(--ids-btn-border-secondary-hover);
}

.ids-btn--secondary.ids-btn--disabled,
Expand Down
Loading