Skip to content

Commit

Permalink
Merge branch 'main' into uyen/table-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
smmr-dn authored Jan 27, 2025
2 parents c857979 + ad6b0ce commit 78aebb6
Show file tree
Hide file tree
Showing 66 changed files with 199 additions and 172 deletions.
2 changes: 2 additions & 0 deletions apps/website/src/components/LiveExample.astro
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ const cssCode = await (async () => {
<style is:inline>
astro-island {
display: block !important; /* https://github.com/iTwin/iTwinUI/pull/2353 */
max-inline-size: 100cqi;
}
</style>
<style set:html={cssCode}></style>
Expand Down Expand Up @@ -112,6 +113,7 @@ const cssCode = await (async () => {
<style lang='scss'>
@layer components {
demo-box {
container-type: inline-size;
position: relative;
min-height: 300px;
max-height: 500px;
Expand Down
2 changes: 1 addition & 1 deletion examples/Alert.main.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-alert-wrapper {
min-width: min(100%, 350px);
min-width: min(100cqi, 350px);
}
2 changes: 1 addition & 1 deletion examples/Breadcrumbs.customOverflowDropdown.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
inline-size: 75%;
inline-size: 75cqi;
min-inline-size: 150px;
max-inline-size: 425px;
border: 1px solid lightpink;
Expand Down
2 changes: 1 addition & 1 deletion examples/Breadcrumbs.extremeTruncation.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
inline-size: 75%;
inline-size: 75cqi;
min-inline-size: 150px;
max-inline-size: 425px;
border: 1px solid pink;
Expand Down
2 changes: 1 addition & 1 deletion examples/Breadcrumbs.truncation.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
inline-size: 75%;
inline-size: 75cqi;
min-inline-size: 150px;
max-inline-size: 450px;
border: 1px solid pink;
Expand Down
2 changes: 1 addition & 1 deletion examples/ButtonGroup.overflow.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-container {
max-width: 70%;
max-width: 70cqi;
}
2 changes: 1 addition & 1 deletion examples/ButtonGroup.usage.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
width: 60%;
width: 60cqi;
display: flex;
gap: var(--iui-size-xs);
}
Expand Down
2 changes: 1 addition & 1 deletion examples/DropdownMenu.hidemiddleware.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
width: 50%;
width: 50cqi;
}

.list {
Expand Down
2 changes: 1 addition & 1 deletion examples/ExpandableBlock.accordion.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-container {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/ExpandableBlock.actions.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-container {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/ExpandableBlock.borderless.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-container {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/ExpandableBlock.disabled.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-container {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/ExpandableBlock.form.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-container {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/ExpandableBlock.main.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-container {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/ExpandableBlock.small.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-container {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/ExpandableBlock.status.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-container {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/ExpandableBlock.withcaption.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-container {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/Flex.spacer.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
}

.demo-container {
width: 100%;
width: 100cqi;
}
2 changes: 1 addition & 1 deletion examples/Flex.wrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
}

.demo-container {
width: 30%;
width: 30cqi;
}
2 changes: 1 addition & 1 deletion examples/ProgressLinear.label.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
display: flex;
flex-direction: column;
gap: var(--iui-size-s);
width: min(100%, 200px);
width: min(100cqi, 200px);
}
2 changes: 1 addition & 1 deletion examples/ProgressLinear.status.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
display: flex;
flex-direction: column;
gap: var(--iui-size-s);
width: min(100%, 200px);
width: min(100cqi, 200px);
}
2 changes: 1 addition & 1 deletion examples/RadioTile.color.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-radio-tile-group {
width: min(100%, 350px);
width: min(100cqi, 350px);
}
2 changes: 1 addition & 1 deletion examples/RadioTile.main.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-radio-tile-group {
width: min(100%, 350px);
width: min(100cqi, 350px);
}
2 changes: 1 addition & 1 deletion examples/SearchBox.basic.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
width: 70%;
width: 70cqi;
display: flex;
gap: var(--iui-size-xs);
}
2 changes: 1 addition & 1 deletion examples/SearchBox.borderlessexpandbutton.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
width: 70%;
width: 70cqi;
display: flex;
justify-content: center;
gap: var(--iui-size-xs);
Expand Down
2 changes: 1 addition & 1 deletion examples/SearchBox.custom.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
width: 70%;
width: 70cqi;
display: flex;
justify-content: center;
gap: var(--iui-size-xs);
Expand Down
2 changes: 1 addition & 1 deletion examples/SearchBox.customopen.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
width: 70%;
width: 70cqi;
display: flex;
justify-content: center;
gap: var(--iui-size-xs);
Expand Down
2 changes: 1 addition & 1 deletion examples/SearchBox.expandable.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
width: 70%;
width: 70cqi;
display: flex;
justify-content: center;
gap: var(--iui-size-xs);
Expand Down
2 changes: 1 addition & 1 deletion examples/SearchBox.main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
width: 70%;
width: 70cqi;
display: flex;
gap: var(--iui-size-xs);
}
2 changes: 1 addition & 1 deletion examples/SearchBox.size.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
width: 70%;
width: 70cqi;
display: flex;
flex-direction: column;
gap: var(--iui-size-xs);
Expand Down
2 changes: 1 addition & 1 deletion examples/SearchBox.status.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
width: 70%;
width: 70cqi;
display: flex;
flex-direction: column;
gap: var(--iui-size-xs);
Expand Down
2 changes: 1 addition & 1 deletion examples/SkipToContentLink.main.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
align-items: center;
justify-content: center;
min-height: 300px;
width: 100%;
width: 100cqi;
transform: translateX(0); /* creates containing block for position: fixed */
}
2 changes: 1 addition & 1 deletion examples/Slider.labels.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-input-grid {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/Slider.main.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-input-grid {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/Slider.range.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-input-grid {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/Slider.rangemultiple.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-input-grid {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/Slider.thumbcustom.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
width: min(100%, 300px);
width: min(100cqi, 300px);
}

.demo-thumb {
Expand Down
2 changes: 1 addition & 1 deletion examples/Slider.tooltipcustom.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-input-grid {
width: min(100%, 300px);
width: min(100cqi, 300px);
}
2 changes: 1 addition & 1 deletion examples/Slider.tooltipnone.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-input-grid {
width: min(100%, 300px);
width: min(100cqi, 300px);
}

.demo-text {
Expand Down
2 changes: 1 addition & 1 deletion examples/Stepper.customIcon.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
min-width: min(100%, 400px);
min-width: min(100cqi, 400px);
display: flex;
flex-direction: column;
gap: var(--iui-size-m);
Expand Down
2 changes: 1 addition & 1 deletion examples/Stepper.layout.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
min-width: min(100%, 400px);
min-width: min(100cqi, 400px);
display: flex;
flex-direction: column;
gap: var(--iui-size-m);
Expand Down
2 changes: 1 addition & 1 deletion examples/Stepper.localization.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
min-width: min(100%, 400px);
min-width: min(100cqi, 400px);
display: flex;
flex-direction: column;
gap: var(--iui-size-m);
Expand Down
2 changes: 1 addition & 1 deletion examples/Stepper.long.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
min-width: min(100%, 400px);
min-width: min(100cqi, 400px);
display: flex;
flex-direction: column;
gap: var(--iui-size-m);
Expand Down
2 changes: 1 addition & 1 deletion examples/Stepper.main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
min-width: min(100%, 400px);
min-width: min(100cqi, 400px);
display: flex;
flex-direction: column;
gap: var(--iui-size-m);
Expand Down
2 changes: 1 addition & 1 deletion examples/Stepper.short.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
min-width: min(100%, 400px);
min-width: min(100cqi, 400px);
display: flex;
flex-direction: column;
gap: var(--iui-size-m);
Expand Down
2 changes: 1 addition & 1 deletion examples/Stepper.tooltip.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.demo-container {
min-width: min(100%, 400px);
min-width: min(100cqi, 400px);
display: flex;
flex-direction: column;
gap: var(--iui-size-m);
Expand Down
2 changes: 1 addition & 1 deletion examples/Table.main.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-container {
width: 500px;
min-width: min(100cqi, 350px);
}
3 changes: 3 additions & 0 deletions examples/Tabs.actions.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.demo-container {
inline-size: min(100cqi, 400px);
}
52 changes: 27 additions & 25 deletions examples/Tabs.actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,34 @@ import { Tabs, Button } from '@itwin/itwinui-react';

export default () => {
return (
<Tabs.Wrapper>
<Tabs.TabList>
<Tabs.Tab value='apple' label='Apple' key='apple' />
<Tabs.Tab value='orange' label='Orange' key='orange' />
<Tabs.Tab value='pear' label='Pear' key='pear' />
</Tabs.TabList>
<div className='demo-container'>
<Tabs.Wrapper>
<Tabs.TabList>
<Tabs.Tab value='apple' label='Apple' key='apple' />
<Tabs.Tab value='orange' label='Orange' key='orange' />
<Tabs.Tab value='pear' label='Pear' key='pear' />
</Tabs.TabList>

<Tabs.Actions>
<Button size='small'>My action</Button>
</Tabs.Actions>
<Tabs.Actions>
<Button size='small'>My action</Button>
</Tabs.Actions>

<Tabs.Panel value='apple' key='apple'>
An apple is a round, edible fruit produced by an apple tree (Malus
domestica). Apple trees are cultivated worldwide and are the most widely
grown species in the genus Malus.
</Tabs.Panel>
<Tabs.Panel value='orange' key='orange'>
An orange is a fruit of various citrus species in the family Rutaceae
(see list of plants known as orange); it primarily refers to Citrus x
sinensis, which is also called sweet orange, to distinguish it from the
related Citrus x aurantium, referred to as bitter orange.
</Tabs.Panel>
<Tabs.Panel value='pear' key='pear'>
Pears are fruits produced and consumed around the world, growing on a
tree and harvested in late summer into mid-autumn.
</Tabs.Panel>
</Tabs.Wrapper>
<Tabs.Panel value='apple' key='apple'>
An apple is a round, edible fruit produced by an apple tree (Malus
domestica). Apple trees are cultivated worldwide and are the most
widely grown species in the genus Malus.
</Tabs.Panel>
<Tabs.Panel value='orange' key='orange'>
An orange is a fruit of various citrus species in the family Rutaceae
(see list of plants known as orange); it primarily refers to Citrus x
sinensis, which is also called sweet orange, to distinguish it from
the related Citrus x aurantium, referred to as bitter orange.
</Tabs.Panel>
<Tabs.Panel value='pear' key='pear'>
Pears are fruits produced and consumed around the world, growing on a
tree and harvested in late summer into mid-autumn.
</Tabs.Panel>
</Tabs.Wrapper>
</div>
);
};
3 changes: 3 additions & 0 deletions examples/Tabs.borderless.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.demo-container {
inline-size: min(100cqi, 400px);
}
Loading

0 comments on commit 78aebb6

Please sign in to comment.