Skip to content

Button: Add opt-in prop for larger isSmall size #51012

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.

Sign up for GitHub

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

Merged
mirka merged 5 commits into from
May 30, 2023
+28 −3
Merged

Button: Add opt-in prop for larger isSmall size #51012

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
489c422
Button: Add opt-in prop for larger `isSmall` size
mirka May 26, 2023
3549448
Add changelog
mirka May 26, 2023
546d366
Merge branch 'trunk' into button-32px-small
mirka May 26, 2023
e766e48
Fix Sass vars
mirka May 29, 2023
5c10f02
Merge branch 'trunk' into button-32px-small
mirka May 29, 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
Prev Previous commit
Next Next commit
Fix Sass vars
  • Loading branch information
@mirka
mirka committed May 29, 2023
commit e766e48afd17bd0ec772e3560557f455584c547e
2 changes: 1 addition & 1 deletion packages/base-styles/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ $grid-unit-80: 8 * $grid-unit; // 64px
*/

$icon-size: 24px;
$icon-size-next-default-32px: 32px; // transitionary variable for next small button size
$button-size: 36px;
$button-size-next-default-40px: 40px; // transitionary variable for next default button size
$button-size-small: 24px;
$button-size-small-next-default-32px: 32px; // transitionary variable for next small button size
$header-height: 60px;
$panel-header-height: $grid-unit-60;
$nav-sidebar-width: 360px;
Expand Down
12 changes: 6 additions & 6 deletions packages/components/src/button/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,23 +263,23 @@
}

&.is-small {
height: $icon-size-next-default-32px;
height: $button-size-small-next-default-32px;
line-height: 22px;
padding: 0 8px;
font-size: 11px;

&.has-icon:not(.has-text) {
padding: 0;
width: $icon-size-next-default-32px;
min-width: $icon-size-next-default-32px;
width: $button-size-small-next-default-32px;
min-width: $button-size-small-next-default-32px;
}

&:not(.is-next-32px-small-size) {
height: $icon-size;
height: $button-size-small;

&.has-icon:not(.has-text) {
width: $icon-size;
min-width: $icon-size;
width: $button-size-small;
min-width: $button-size-small;
}
}
}
Expand Down