Skip to content

Commit 6dcfe20

Browse files
Merge branch 'next'
2 parents 67d0cbd + f9e3dfd commit 6dcfe20

9 files changed

+22
-4
lines changed
Loading
Loading
Loading
Loading
Loading
Loading

__tests__/fixtures/code-block-tests.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ category: 5fdf9fc9c2a7ef443e937315
44
hidden: true
55
---
66

7-
# Basics
7+
## Basics
88

99
### Simple
1010

1111
```php
1212
<b><?= "Hello world!" ?></b>;
1313
```
14+
1415
```js
1516
console.log('Hello world!');
1617
```
@@ -20,6 +21,7 @@ console.log('Hello world!');
2021
```Zed
2122
Tab Number Zero
2223
```
24+
2325
```One
2426
Tab Number One
2527
```
@@ -29,14 +31,16 @@ Tab Number One
2931
```js English
3032
console.log('Hello world!');
3133
```
34+
3235
```js French
3336
console.log('Bonjour le monde!');
3437
```
38+
3539
```js German
3640
console.log('Hallo welt!');
3741
```
3842

39-
# Breakage
43+
## Breakage
4044

4145
### Block Separator 👍
4246

@@ -82,7 +86,7 @@ Section **Two**
8286
console.log('one');
8387
```
8488

85-
# Block Wraps
89+
## Block Wraps
8690

8791
### List-Internal
8892

@@ -95,3 +99,9 @@ console.log('one');
9599
```URL
96100
{{company_url}}
97101
```
102+
103+
## Formatting
104+
105+
```
106+
This is a long line that will be wrapped to fit within the container.
107+
```

components/Callout/style.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,9 @@
128128
font: normal normal normal 1em/1 var(--icon-font);
129129
}
130130
}
131+
131132
.callout-icon {
133+
font-size: 1.25em; // match h3
132134
left: -0.25em;
133135
position: absolute;
134136

@@ -140,6 +142,11 @@
140142
.callout-icon + .heading.heading {
141143
margin-top: 0;
142144
}
145+
146+
> .callout-icon_fa {
147+
--fa-primary-color: var(--Callout-title);
148+
--fa-secondary-color: var(--Callout-title);
149+
}
143150
}
144151

145152
@mixin calloutCustomIcons($R: callout) {

components/Code/style.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
font-size: 100%;
5050
margin: 0;
5151
padding: 0;
52-
white-space: pre;
52+
text-wrap: wrap;
53+
white-space: pre-wrap;
5354
word-break: normal;
5455
}
5556

0 commit comments

Comments
 (0)