Skip to content

Commit b3b513a

Browse files
committed
Merge branch 'master' of https://github.com/prysmex/ember-eui
2 parents 111b1de + bc3c052 commit b3b513a

File tree

25 files changed

+57
-180
lines changed

25 files changed

+57
-180
lines changed

packages/core/addon/components/eui-described-form-group/index.hbs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
>
99
<EuiFlexGroup @gutterSize={{arg-or-default @gutterSize "l"}}>
1010
<EuiFlexItem @grow={{@descriptionFlexItemProps.grow}}>
11-
<EuiTitle class="euiDescribedFormGroup__title" @size={{@titleSize}}>
11+
<EuiTitle
12+
class="euiDescribedFormGroup__title"
13+
@size={{@titleSize}}
14+
@tagName={{@titleTagName}}
15+
>
1216
{{yield to="title"}}
1317
</EuiTitle>
1418
<EuiText

packages/core/docs/display/notification-event/demo/d01-notification-event.md

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
order: 1
33
---
44

5-
# Basic
6-
75
```hbs template
8-
{{#let (slice
9-
0 this.messagesCount this.messages
10-
) as |msgs|}}
6+
{{#let (slice 0 this.messagesCount this.messages) as |msgs|}}
117
<EuiPanel @paddingSize='xs'>
128
<EuiNotificationEvent
139
@type='Hey!'
@@ -20,21 +16,21 @@ order: 1
2016
@accordionHideText='hide'
2117
>
2218
23-
<:primaryAction>
24-
<EuiButtonEmpty
25-
style="display: {{if this.showPrimaryAction '' 'none'}};"
26-
@flush="left"
27-
@size="s"
28-
>
29-
Do something!
30-
</EuiButtonEmpty>
31-
</:primaryAction>
19+
<:primaryAction>
20+
<EuiButtonEmpty
21+
style='display: {{if this.showPrimaryAction "" "none"}};'
22+
@flush='left'
23+
@size='s'
24+
>
25+
Do something!
26+
</EuiButtonEmpty>
27+
</:primaryAction>
3228
3329
</EuiNotificationEvent>
3430
</EuiPanel>
3531
{{/let}}
3632
37-
<EuiSpacer/>
33+
<EuiSpacer />
3834
3935
Messages count:
4036
<EuiRange
@@ -61,12 +57,8 @@ import { action } from '@ember/object';
6157
export default class NotificationEvent1Component extends Component {
6258
@tracked messagesCount;
6359
@tracked showPrimaryAction;
64-
65-
messages = [
66-
'This is a message',
67-
"Wait, there's more",
68-
'hmmm...'
69-
]
60+
61+
messages = ['This is a message', "Wait, there's more", 'hmmm...'];
7062

7163
constructor() {
7264
super(...arguments);
@@ -75,9 +67,8 @@ export default class NotificationEvent1Component extends Component {
7567
}
7668

7769
@action
78-
setMessagesCount(e){
70+
setMessagesCount(e) {
7971
this.messagesCount = e.target.value;
8072
}
81-
8273
}
83-
```
74+
```

packages/core/docs/editors/code/inline-demo/demo1.md renamed to packages/core/docs/editors/code/demo/d01-inline.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
order: 1
33
---
44

5+
# Inline
6+
57
```hbs template
68
<EuiText>
79
<p>

packages/core/docs/editors/code/code-block-demo/demo1.md renamed to packages/core/docs/editors/code/demo/d02-code-block.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
order: 1
2+
order: 2
33
---
44

55
# Code block

packages/core/docs/editors/code/code-block-demo/demo5.md renamed to packages/core/docs/editors/code/demo/d03-line-numbers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
order: 5
2+
order: 3
33
---
44

55
# Line numbers

packages/core/docs/editors/code/code-block-demo/demo2.md renamed to packages/core/docs/editors/code/demo/d04-copy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
order: 2
2+
order: 4
33
---
44

55
# Copy

packages/core/docs/editors/code/code-block-demo/demo3.md renamed to packages/core/docs/editors/code/demo/d05-overflow-height.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
order: 3
2+
order: 5
33
---
44

55
# Overflow height

packages/core/docs/editors/code/code-block-demo/demo4.md renamed to packages/core/docs/editors/code/demo/d06-white-space.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
order: 4
2+
order: 6
33
---
44

55
# White space

packages/core/docs/editors/code/code-block-demo/demo6.md renamed to packages/core/docs/editors/code/demo/d07-line-numbers-highlighted.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
order: 6
2+
order: 7
33
---
44

55
# Line numbers highlighted

packages/core/docs/editors/code/code-block-demo/demo7.md renamed to packages/core/docs/editors/code/demo/d08-code-block-virtualization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
order: 7
2+
order: 8
33
---
44

55
# Code block virtualization

0 commit comments

Comments
 (0)