Skip to content
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/dry-donuts-prove.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@cube-dev/ui-kit': patch
---

Fix outline styles after migration in various components.
5 changes: 5 additions & 0 deletions .changeset/pink-frogs-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@cube-dev/ui-kit': patch
---

Fix border radius in Action buttons in CopySnippet.
7 changes: 4 additions & 3 deletions src/components/content/CopyPasteBlock/CopyPasteBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,16 @@ const CopyButton = tasty(Button, {
styles: {
placeSelf: 'stretch',
border: '#clear',
outline: {
'': '#purple-03.0',
'focused & focus-visible': '#purple-03 inset',
shadow: {
'': '0 0 0 1ow #purple-03.0 inset',
focused: '0 0 0 1ow #purple-03 inset',
},
radius: {
'': '0 1r 1r 0',
'multiline | with-scroll': '0 1r 0 0',
},
height: 'auto',
outline: false,
},
});

Expand Down
29 changes: 20 additions & 9 deletions src/components/content/CopySnippet/CopySnippet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,19 @@ const ButtonContainer = tasty({
multiline: '4x',
},

'@button-radius': {
'@first-button-radius': {
'': '0 1r 1r 0',
multiline: '0 1r 0 0',
},

'@last-button-radius': {
'': '0',
multiline: '1r',
multiline: '0 0 0 1r',
},

'@first-and-last-button-radius': {
'': '0 1r 1r 0',
multiline: '0 1r 0 1r',
},

// Make sure there's a small gap between buttons and the content
Expand Down Expand Up @@ -110,16 +120,17 @@ const ActionButton = tasty(Button, {
padding: 0,
placeSelf: 'stretch',
border: '#clear',
outline: {
'': '#purple-03.0',
'focused & focus-visible': '#purple-03 inset',
shadow: {
'': 'inset 0 0 0 1ow #purple-03.0',
focused: 'inset 0 0 0 1ow #purple-03',
},
outline: false,
height: '@button-size',
radius: {
'': '0',
':last-child': '0 0 0 @button-radius',
':first-child': '0 @button-radius 0 0',
':last-child & :first-child': '0 @button-radius 0 @button-radius',
'': 0,
':last-child': '@last-button-radius',
':first-child': '@first-button-radius',
':first-child & :last-child': '@first-and-last-button-radius',
},
},
});
Expand Down
6 changes: 1 addition & 5 deletions src/components/organisms/FileTabs/FileTabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ const TabElement = tasty(Action, {
fontWeight: 500,
opacity: 1,
preset: 'default',
shadow: {
'': 'inset 0 0 0 1ow #purple-03.0',
'focused & focus-visible': 'inset 0 0 0 1ow #purple-03',
},
transform: {
'': 'translate(0, 0)',
'[disabled]': 'translate(0, 1bw)',
Expand Down Expand Up @@ -150,7 +146,7 @@ const CloseButton = tasty(Button, {
padding: '.25x',
outline: {
'': '#purple-03.0',
'focused & focus-visible': '#purple-03',
focused: '#purple-03',
},
radius: '1r',
},
Expand Down
4 changes: 4 additions & 0 deletions src/components/pickers/Menu/MenuButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ const StyledButton = tasty(Block, {
flow: 'row',
justifyContent: 'start',
gap: '.75x',
outline: {
'': '#purple-03.0',
'focused & focus-visible': '#purple-03',
},

ButtonIcon: {
display: 'grid',
Expand Down
9 changes: 8 additions & 1 deletion src/tasty/styles/transition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@ const MAP = {
'font-style',
],
text: ['font-weight', 'text-decoration-color'],
theme: ['color', 'background-color', 'box-shadow', 'border', 'border-radius'],
theme: [
'color',
'background-color',
'box-shadow',
'border',
'border-radius',
'outline',
],
inset: ['box-shadow'],
mark: ['box-shadow'],
width: ['max-width', 'min-width', 'width'],
Expand Down
Loading