Skip to content

Commit cdafcf1

Browse files
authored
Merge branch 'primer:main' into gap
2 parents 62a10ba + df81e6e commit cdafcf1

File tree

8 files changed

+11
-358
lines changed

8 files changed

+11
-358
lines changed

.changeset/cuddly-months-greet.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/css": patch
3+
---
4+
5+
Moving segmented_control.css to primer_view_components

docs/content/utilities/margin.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ Use directional utilities to apply margin to an individual side, or the X and Y
7373
The extended scale starts from spacer `7` up to `12`. **Note**: Only the y-axis (`mt`, `mb` and `my`) and its responsive variants are supported.
7474

7575
```html live
76-
<div class="color-bg-attention d-inline-block"><div class="mt-7 p-1 color-bg-subtle">.mb-7</div></div>
77-
<div class="color-bg-attention d-inline-block"><div class="mt-8 p-1 color-bg-subtle">.mb-8</div></div>
78-
<div class="color-bg-attention d-inline-block"><div class="mt-9 p-1 color-bg-subtle">.mb-9</div></div>
79-
<div class="color-bg-attention d-inline-block"><div class="mt-10 p-1 color-bg-subtle">.mb-10</div></div>
80-
<div class="color-bg-attention d-inline-block"><div class="mt-11 p-1 color-bg-subtle">.mb-11</div></div>
81-
<div class="color-bg-attention d-inline-block"><div class="mt-12 p-1 color-bg-subtle">.mb-12</div></div>
76+
<div class="color-bg-attention d-inline-block"><div class="mt-7 p-1 color-bg-subtle">.mt-7</div></div>
77+
<div class="color-bg-attention d-inline-block"><div class="mt-8 p-1 color-bg-subtle">.mt-8</div></div>
78+
<div class="color-bg-attention d-inline-block"><div class="mt-9 p-1 color-bg-subtle">.mt-9</div></div>
79+
<div class="color-bg-attention d-inline-block"><div class="mt-10 p-1 color-bg-subtle">.mt-10</div></div>
80+
<div class="color-bg-attention d-inline-block"><div class="mt-11 p-1 color-bg-subtle">.mt-11</div></div>
81+
<div class="color-bg-attention d-inline-block"><div class="mt-12 p-1 color-bg-subtle">.mt-12</div></div>
8282
```
8383

8484
## Center elements

docs/src/stories/components/SegmentedControl/SegmentedControl.stories.jsx

Lines changed: 0 additions & 92 deletions
This file was deleted.

docs/src/stories/components/SegmentedControl/SegmentedControlButton.stories.jsx

Lines changed: 0 additions & 64 deletions
This file was deleted.

src/core/index.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
@import '../links/index.scss';
2323
@import '../navigation/index.scss';
2424
@import '../pagination/index.scss';
25-
@import '../segmented-control/index.scss';
2625
@import '../tooltips/index.scss';
2726
@import '../truncate/index.scss';
2827
@import '../overlay/index.scss';

src/segmented-control/README.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/segmented-control/index.scss

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/segmented-control/segmented-control.scss

Lines changed: 0 additions & 167 deletions
This file was deleted.

0 commit comments

Comments
 (0)