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.

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

fix: ghost button normal and field padding #3364

Merged
merged 10 commits into from
Jul 17, 2019
Merged

fix: ghost button normal and field padding #3364

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5eac1c9
fix: ghost button normal and field padding
vpicone Jul 11, 2019
0882451
Merge branch 'master' into ghost-button-padding-fix
vpicone Jul 11, 2019
0d1092f
Merge branch 'master' into ghost-button-padding-fix
vpicone Jul 12, 2019
6c11471
Merge branch 'master' into ghost-button-padding-fix
vpicone Jul 16, 2019
93249ee
Merge branch 'master' into ghost-button-padding-fix
vpicone Jul 16, 2019
1e289a9
Merge branch 'master' into ghost-button-padding-fix
joshblack Jul 16, 2019
ab73d22
Merge branch 'master' into ghost-button-padding-fix
joshblack Jul 17, 2019
8ce11f0
docs: add button padding explanation
vpicone Jul 17, 2019
fe1d270
Merge branch 'ghost-button-padding-fix' of github.com:vpicone/carbon …
vpicone Jul 17, 2019
f4ca4a2
Merge branch 'master' into ghost-button-padding-fix
joshblack Jul 17, 2019
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: 4 additions & 0 deletions packages/components/src/components/button/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@
&.#{$prefix}--btn--sm {
padding: $button-padding-ghost-sm;
}

&.#{$prefix}--btn--field {
padding: $button-padding-ghost-field;
}
}

.#{$prefix}--btn--icon-only {
Expand Down
7 changes: 6 additions & 1 deletion packages/components/src/globals/scss/_theme-tokens.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,18 @@
/// @type Number
/// @access public
/// @group button
$button-padding-ghost: 11px 13px !default !global;
$button-padding-ghost: calc(0.875rem - 3px) 12px !default !global;

/// @type Number
/// @access public
/// @group button
$button-padding-ghost-sm: 0.375rem 1rem !default !global;

/// @type Number
/// @access public
/// @group button
$button-padding-ghost-field: calc(0.675rem - 3px) 12px !default !global;

/// @type Number
/// @access public
/// @group button
Expand Down