Skip to content

Commit d9450f3

Browse files
authored
Merge branch 'main' into upgrade-stylelint-config
2 parents b0fee1c + 7c85c50 commit d9450f3

File tree

7 files changed

+37
-1
lines changed

7 files changed

+37
-1
lines changed

.changeset/famous-masks-end.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+
Fix `input-block` in `form-group`

.changeset/fuzzy-bananas-kiss.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+
Fix sequence of content in Subhead

.changeset/tall-experts-hammer.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+
Render headings inline when in a `<summary>`

docs/content/components/subhead.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ Use all the elements together to create a Subhead with actions and a description
6565
```html live title="Subhead with actions and description"
6666
<div class="Subhead">
6767
<h2 class="Subhead-heading">Subhead with actions and description</h2>
68-
<div class="Subhead-actions"><a href="#url" class="btn btn-sm btn-primary" role="button">Action</a></div>
6968
<div class="Subhead-description">The subhead is a subdued header style with a light bottom border.</div>
69+
<div class="Subhead-actions"><a href="#url" class="btn btn-sm btn-primary" role="button">Action</a></div>
7070
</div>
7171
```
7272

src/forms/form-group.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
&.short { width: 250px; }
3232

33+
&.input-block,
3334
&.long { width: 100%; }
3435
}
3536

src/markdown/headings.scss

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,21 @@
7171
font-size: 0.85em;
7272
color: var(--color-fg-muted);
7373
}
74+
75+
summary {
76+
h1,
77+
h2,
78+
h3,
79+
h4,
80+
h5,
81+
h6 {
82+
display: inline-block;
83+
}
84+
85+
h1,
86+
h2 {
87+
padding-bottom: 0;
88+
border-bottom: 0;
89+
}
90+
}
7491
}

src/subhead/subhead.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
font-size: $h2-size;
1919
font-weight: $font-weight-normal;
2020
flex: 1 1 auto;
21+
order: 0;
2122
}
2223

2324
// Make the text bold and red for dangerous content
@@ -31,13 +32,15 @@
3132
font-size: $body-font-size;
3233
color: var(--color-fg-muted);
3334
flex: 1 100%;
35+
order: 2;
3436
}
3537

3638
// Add 1 or 2 buttons to the right of the heading
3739
.Subhead-actions {
3840
margin: $spacer-1 0 $spacer-1 $spacer-1;
3941
align-self: center;
4042
justify-content: flex-end;
43+
order: 1;
4144

4245
+ .Subhead-description {
4346
margin-top: $spacer-1;

0 commit comments

Comments
 (0)