Skip to content

Commit 30388b7

Browse files
committed
Merge branch 'master' into next
2 parents f8cfc55 + ac0f182 commit 30388b7

20 files changed

+835
-800
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ features:
3939

4040
## Install
4141

42-
### Vue 3.0
42+
**Vue 3.0**
4343

4444
NPM:
4545

@@ -53,7 +53,7 @@ Yarn:
5353
yarn add vue-final-modal@next
5454
```
5555

56-
### Vue 2.x
56+
**Vue 2.x**
5757

5858
NPM:
5959

@@ -69,7 +69,7 @@ yarn add vue-final-modal
6969

7070
## Basic usage
7171

72-
1. Import and register the modal component.
72+
**1. Import and register the modal component.**
7373

7474
```js
7575
import { VueFinalModal } from 'vue-final-modal'
@@ -81,21 +81,21 @@ export default {
8181
}
8282
```
8383

84-
2. Add the modal component to the template.
84+
**2. Add the modal component to the template.**
8585

8686
```html
8787
<vue-final-modal v-model="showModal">
8888
Modal Content Here
8989
</vue-final-modal>
9090
```
9191

92-
3. Create a button to toggle the modal.
92+
**3. Create a button to toggle the modal.**
9393

9494
```html
9595
<button @click="showModal = true">Launch</button>
9696
```
9797

98-
4. All default props
98+
**4. All default props**
9999

100100
```js
101101
const CLASS_TYPES = [String, Object, Array]
@@ -118,7 +118,7 @@ const CLASS_TYPES = [String, Object, Array]
118118
}
119119
```
120120

121-
5. Events.
121+
**5. Events.**
122122

123123
- @before-open: Before open
124124
- @opened: When opened

docs/content/en/examples/stepByStep.md

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,17 @@ fullscreen: true
1616

1717
## Style the modal component step by step
1818

19-
**1. Hello, `vue-final-modal` !**
19+
**1. Hello, `vue-final-modal`**
2020

2121
<v-basic></v-basic>
2222

23-
<!-- <codepen path="basic/VBasic"></codepen> -->
24-
2523
<show-code>
2624

2725
```vue
2826
<template>
2927
<div>
3028
<vue-final-modal v-model="showModal">
31-
<span class="modal__title">Hello, vue-final-modal !</span>
29+
<span class="modal__title">Hello, vue-final-modal</span>
3230
</vue-final-modal>
3331
<button class="vfm-btn" @click="showModal = true">Open modal</button>
3432
</div>
@@ -56,15 +54,13 @@ export default {
5654

5755
<v-background></v-background>
5856

59-
<!-- <codepen path="basic/VBackground"></codepen> -->
60-
6157
<show-code>
6258

6359
```vue
6460
<template>
6561
<div>
6662
<vue-final-modal v-model="showModal" content-class="modal-content">
67-
<span class="modal__title">Hello, vue-final-modal !</span>
63+
<span class="modal__title">Hello, vue-final-modal</span>
6864
</vue-final-modal>
6965
<button class="vfm-btn" @click="showModal = true">Open modal</button>
7066
</div>
@@ -106,8 +102,6 @@ export default {
106102

107103
<v-centered></v-centered>
108104

109-
<!-- <codepen path="basic/VCentered"></codepen> -->
110-
111105
<show-code>
112106

113107
```vue
@@ -118,7 +112,7 @@ export default {
118112
classes="modal-container"
119113
content-class="modal-content"
120114
>
121-
<span class="modal__title">Hello, vue-final-modal !</span>
115+
<span class="modal__title">Hello, vue-final-modal</span>
122116
</vue-final-modal>
123117
<button class="vfm-btn" @click="showModal = true">Open modal</button>
124118
</div>
@@ -167,8 +161,6 @@ export default {
167161

168162
<v-content></v-content>
169163

170-
<!-- <codepen path="basic/VContent"></codepen> -->
171-
172164
<show-code>
173165

174166
```vue
@@ -179,7 +171,7 @@ export default {
179171
classes="modal-container"
180172
content-class="modal-content"
181173
>
182-
<span class="modal__title">Hello, vue-final-modal !</span>
174+
<span class="modal__title">Hello, vue-final-modal</span>
183175
<div class="modal__content">
184176
<p>
185177
Vue Final Modal is a renderless, stackable, detachable and lightweight
@@ -234,8 +226,6 @@ export default {
234226

235227
<v-close-button></v-close-button>
236228

237-
<!-- <codepen path="basic/VCloseButton"></codepen> -->
238-
239229
<show-code>
240230

241231
```vue
@@ -249,7 +239,7 @@ export default {
249239
<button class="modal__close" @click="showModal = false">
250240
<mdi-close></mdi-close>
251241
</button>
252-
<span class="modal__title">Hello, vue-final-modal !</span>
242+
<span class="modal__title">Hello, vue-final-modal</span>
253243
<div class="modal__content">
254244
<p>
255245
Vue Final Modal is a renderless, stackable, detachable and lightweight
@@ -311,8 +301,6 @@ export default {
311301

312302
<v-scrollable></v-scrollable>
313303

314-
<!-- <codepen path="basic/VScrollable"></codepen> -->
315-
316304
<show-code>
317305

318306
```vue
@@ -326,7 +314,7 @@ export default {
326314
<button class="modal__close" @click="showModal = false">
327315
<mdi-close></mdi-close>
328316
</button>
329-
<span class="modal__title">Hello, vue-final-modal !</span>
317+
<span class="modal__title">Hello, vue-final-modal</span>
330318
<div class="modal__content">
331319
<p v-for="i in 100" :key="i">
332320
Vue Final Modal is a renderless, stackable, detachable and lightweight
@@ -393,8 +381,6 @@ export default {
393381

394382
<v-action-buttons></v-action-buttons>
395383

396-
<!-- <codepen path="basic/VActionButtons"></codepen> -->
397-
398384
<show-code>
399385

400386
```vue
@@ -408,7 +394,7 @@ export default {
408394
<button class="modal__close" @click="showModal = false">
409395
<mdi-close></mdi-close>
410396
</button>
411-
<span class="modal__title">Hello, vue-final-modal !</span>
397+
<span class="modal__title">Hello, vue-final-modal</span>
412398
<div class="modal__content">
413399
<p v-for="i in 100" :key="i">
414400
Vue Final Modal is a renderless, stackable, detachable and lightweight
@@ -461,6 +447,8 @@ export default {
461447
.modal__action {
462448
display: flex;
463449
justify-content: center;
450+
align-items: center;
451+
flex-shrink: 0;
464452
padding: 1rem 0 0;
465453
}
466454
.modal__close {
@@ -484,8 +472,6 @@ export default {
484472

485473
<v-stackable></v-stackable>
486474

487-
<!-- <codepen path="basic/VStackable"></codepen> -->
488-
489475
<show-code>
490476

491477
```vue
@@ -496,10 +482,10 @@ export default {
496482
classes="modal-container"
497483
content-class="modal-content"
498484
>
499-
<button class="modal__close" @click="showModal = true">
485+
<button class="modal__close" @click="showModal = false">
500486
<mdi-close></mdi-close>
501487
</button>
502-
<span class="modal__title">Hello, vue-final-modal !</span>
488+
<span class="modal__title">Hello, vue-final-modal</span>
503489
<div class="modal__content">
504490
<p v-for="i in 100" :key="i">
505491
Vue Final Modal is a renderless, stackable, detachable and lightweight
@@ -585,6 +571,7 @@ export default {
585571
display: flex;
586572
justify-content: center;
587573
align-items: center;
574+
flex-shrink: 0;
588575
padding: 1rem 0 0;
589576
}
590577
.modal__close {

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"@nuxt/content-theme-docs": "^0.6.1",
1313
"nuxt": "^2.14.1",
14-
"vue-final-modal": "^0.13.4"
14+
"vue-final-modal": "^0.13.5"
1515
},
1616
"devDependencies": {
1717
"@nuxtjs/google-analytics": "^2.4.0",

0 commit comments

Comments
 (0)