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

feat: add experimental contextual layout token system #13287

Merged
merged 64 commits into from
Jun 2, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
8953d2c
chore: rename Layout folder into LayoutDirection
janhassel Mar 3, 2023
7efe5e7
feat: build contextual layout poc
janhassel Mar 3, 2023
0a0c3c7
docs: add layoutSize and layoutDensity controls to storybook
janhassel Mar 16, 2023
9846ed4
chore(contained-list): migrate to contextual layout tokens
janhassel Mar 16, 2023
8148e66
chore(content-switcher): migrate to contextual layout tokens
janhassel Mar 16, 2023
1f4241b
feat(contextual-layout-tokens): add support for redefinition
janhassel Mar 16, 2023
2cdeddc
chore(tag): migrate to contextual layout tokens
janhassel Mar 16, 2023
b323cad
feat(contextual-layout-tokens): support multiple properties per group
janhassel Mar 24, 2023
b45f07e
docs(styles): add contextual layout tokens
janhassel Mar 27, 2023
9ebc0ed
chore(button): migrate to contextual layout tokens
janhassel Mar 27, 2023
6648fba
Merge remote-tracking branch 'upstream/main' into 10619
janhassel Mar 27, 2023
3d44663
docs(contextual-layout-tokens): add reference
janhassel Mar 27, 2023
477b67b
chore(icon-button): migrate to contextual layout tokens
janhassel Mar 28, 2023
7c0acce
fix(code-snippet): adjust style overrides for icon button
janhassel Mar 28, 2023
c957ff3
docs(contextual-layout-tokens): add sass helper outputs
janhassel Mar 28, 2023
65454fc
fix(contained-list): adjust padding-block based on line-height
janhassel Mar 28, 2023
5011279
fix(code-snippet): adjust copy-button overrides
janhassel Mar 28, 2023
6b0e301
fix(file-uploader): emit layout size
janhassel Mar 28, 2023
f53a29f
docs(contextual-layout-tokens): add docs to Layout story
janhassel Mar 28, 2023
1353fd7
fix(code-snippet): pass correct size
janhassel Mar 28, 2023
f242fef
docs(contained-list): fix stories
janhassel Mar 28, 2023
d5906af
fix(icon-button): make default lg
janhassel Mar 29, 2023
a8bcd35
Merge branch 'main' into 10619
janhassel Mar 31, 2023
67b0007
fix(readme): resolve conflict
janhassel Mar 31, 2023
299cafe
Merge branch 'main' into 10619
janhassel Mar 31, 2023
04c8108
Merge branch 'main' into 10619
janhassel Apr 3, 2023
50ea6b1
chore: align v12 deprecation comments
janhassel Apr 3, 2023
ddfac4d
chore: revert local .all-contributors updates
janhassel Apr 4, 2023
82ba907
Merge branch 'main' into 10619
janhassel Apr 4, 2023
fcc4aac
docs(contextual-layout-tokens): fix comment position
janhassel Apr 4, 2023
4e3f2e8
Merge branch '10619' of https://github.com/janhassel/carbon into 10619
janhassel Apr 4, 2023
5f13d32
Merge remote-tracking branch 'upstream/main' into 10619
janhassel Apr 14, 2023
001e8c2
chore: rename storybook layout controls
janhassel Apr 14, 2023
c9ae6e0
chore: only show layout controls in dev storybook
janhassel Apr 14, 2023
d18248f
fix(button): move icon up 1px
janhassel Apr 14, 2023
5f407b9
fix(accordion): fix arrow icon position
janhassel Apr 14, 2023
b029a04
fix(icon-button): fix icon position
janhassel Apr 14, 2023
154d913
fix(icon-button): fix icon position
janhassel Apr 14, 2023
64d445a
fix(overflow-menu): fix icon position
janhassel Apr 14, 2023
c0b3e49
fix(ui-shell): fix header action icon position
janhassel Apr 14, 2023
d79c2de
fix(code-snippet): fix icon position in button
janhassel Apr 17, 2023
c713c9a
fix(pagination): fix icon position in button
janhassel Apr 17, 2023
e0ca63a
refactor(contextual-layout-tokens): alternative poc
janhassel Apr 18, 2023
fefc86d
refactor(contextual-layout-token): implement LayoutConstraint system
janhassel Apr 26, 2023
030f1c6
refactor(contextual-layout-tokens): re-implement redefine-tokens mixin
janhassel Apr 26, 2023
90694c4
docs(contextual-layout-tokens): update docs to reflect refactor
janhassel Apr 27, 2023
802fe00
fix(conextual-layout-tokens): remove outdated workarounds
janhassel Apr 27, 2023
f4f8de8
Merge remote-tracking branch 'upstream/main' into 10619
janhassel Apr 27, 2023
09387fb
fix(contained-list): make persistent search work with size variants
janhassel Apr 27, 2023
5830ff6
fix(content-switcher): fix icon-only styles
janhassel Apr 27, 2023
7058270
chore: update datatable snapshot
janhassel May 2, 2023
2077f2e
docs(layout): add information about LayoutConstraint
janhassel May 4, 2023
fb05359
Merge branch 'main' into 10619
janhassel May 4, 2023
60f6d77
fix(copy-button): wrap in LayoutConstraint
janhassel May 4, 2023
c24ca31
Merge remote-tracking branch 'upstream/main' into 10619
janhassel May 15, 2023
3a34855
chore: run prettier
janhassel May 15, 2023
071dff6
fix: revert unrelated sort change in package.json
janhassel May 15, 2023
5deff97
chore: update toc of style/docs/sass.md
janhassel May 15, 2023
bd2913b
Merge branch 'main' into 10619
janhassel May 15, 2023
9aaa3c7
Merge branch 'main' into 10619
janhassel May 16, 2023
f90a33b
docs(contextual-layout-tokens): fix css reference
janhassel May 16, 2023
5254693
docs(contextual-layout-tokens): fix copy-paste mistake
janhassel May 16, 2023
755c8f4
Merge branch 'main' into 10619
alisonjoseph Jun 1, 2023
d1f4291
Merge branch 'main' into 10619
kodiakhq[bot] Jun 2, 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(button): move icon up 1px
  • Loading branch information
janhassel committed Apr 14, 2023
commit d18248fe2e330e2eacbe2258ada0665b090020b2
4 changes: 3 additions & 1 deletion packages/react/src/components/Button/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ const Button = React.forwardRef(function Button(
/>
);

const iconOnlyImage = !ButtonImageElement ? null : <ButtonImageElement />;
const iconOnlyImage = !ButtonImageElement ? null : (
<ButtonImageElement className={`${prefix}--btn__icon`} />
);

const dangerButtonVariants = ['danger', 'danger--tertiary', 'danger--ghost'];

Expand Down
1 change: 1 addition & 0 deletions packages/styles/scss/components/button/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ $-height: layout.size('height', $default: 'lg');
width: rem(16px);
height: rem(16px);
flex-shrink: 0;
margin-block-start: rem(1px);
}
}

Expand Down