Skip to content

Commit 0f18de9

Browse files
author
Magda
committed
Merge branch 'mikolaj' of github.com:mdbootstrap/mdb-docs-and-content
2 parents a2c7927 + 74f0f90 commit 0f18de9

File tree

17 files changed

+634
-132
lines changed

17 files changed

+634
-132
lines changed

en/vue/web/docs/components/buttons/o.html

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h1 class="secondary-heading mb-4">Vue Buttons - Bootstrap 4 & Material Design</
2222
<section id="basic-buttons">
2323

2424
<!--Title-->
25-
<h2 class="title"><strong>Basic buttons</strong></h2>
25+
<h2 class="section-heading"><strong>Basic buttons</strong></h2>
2626

2727
<!--Description-->
2828
<p class="description">MDB includes 7 predefined button styles, each serving its own semantic purpose.</p>
@@ -115,7 +115,7 @@ <h2 class="title"><strong>Basic buttons</strong></h2>
115115
<section id="additional-buttons">
116116

117117
<!--Title-->
118-
<h2 class="title mb-4"><strong>Additional buttons</strong></h2>
118+
<h2 class="section-heading mb-4"><strong>Additional buttons</strong></h2>
119119

120120
<!--Section: Live preview-->
121121
<section>
@@ -259,7 +259,7 @@ <h2 class="title mb-4"><strong>Additional buttons</strong></h2>
259259
<section id="gradient-buttons">
260260

261261
<!--Title-->
262-
<h2 class="title"><strong>Gradient buttons</strong> <a href="https://mdbootstrap.com/products/vue-ui-kit/" target="_blank" class="btn btn-danger btn-md" role="button">MDB Pro component <i class="far fa-gem ml-1"></i></a></h2>
262+
<h2 class="section-heading"><strong>Gradient buttons</strong> <a href="https://mdbootstrap.com/products/vue-ui-kit/" target="_blank" class="btn btn-danger btn-md" role="button">MDB Pro component <i class="far fa-gem ml-1"></i></a></h2>
263263

264264
<!--Description-->
265265
<p class="description"></p>
@@ -312,7 +312,7 @@ <h2 class="title"><strong>Gradient buttons</strong> <a href="https://mdbootstra
312312
<section id="outline-buttons">
313313

314314
<!--Title-->
315-
<h2 class="title"><strong>Outline buttons</strong></h2>
315+
<h2 class="section-heading"><strong>Outline buttons</strong></h2>
316316

317317
<!--Description-->
318318
<p class="description">In need of a button, but not the hefty background colors they bring? Replace the default modifier classes with the
@@ -372,7 +372,7 @@ <h2 class="title"><strong>Outline buttons</strong></h2>
372372
<section id="rounded-buttons">
373373

374374
<!--Title-->
375-
<h2 class="title mb-4"><strong>Rounded buttons</strong> <a href="https://mdbootstrap.com/products/vue-ui-kit/" class="btn btn-danger btn-md" role="button">MDB Pro component <i class="far fa-gem ml-1"></i></a></h2>
375+
<h2 class="section-heading mb-4"><strong>Rounded buttons</strong> <a href="https://mdbootstrap.com/products/vue-ui-kit/" class="btn btn-danger btn-md" role="button">MDB Pro component <i class="far fa-gem ml-1"></i></a></h2>
376376

377377
<!--Section: Live preview-->
378378
<section>
@@ -428,7 +428,7 @@ <h2 class="title mb-4"><strong>Rounded buttons</strong> <a href="https://mdboots
428428
<section id="rounded-outline-buttons">
429429

430430
<!--Title-->
431-
<h2 class="title"><strong>Rounded outline buttons</strong> <a href="https://mdbootstrap.com/products/vue-ui-kit/" class="btn btn-danger btn-md" role="button">MDB Pro component <i class="far fa-gem ml-1"></i></a></h2>
431+
<h2 class="section-heading"><strong>Rounded outline buttons</strong> <a href="https://mdbootstrap.com/products/vue-ui-kit/" class="btn btn-danger btn-md" role="button">MDB Pro component <i class="far fa-gem ml-1"></i></a></h2>
432432

433433
<!--Section: Live preview-->
434434
<section>
@@ -484,7 +484,7 @@ <h2 class="title"><strong>Rounded outline buttons</strong> <a href="https://mdbo
484484
<section id="floating-buttons">
485485

486486
<!--Title-->
487-
<h2 class="title"><strong>Floating buttons</strong> <a href="https://mdbootstrap.com/products/vue-ui-kit/" class="btn btn-danger btn-md" role="button">MDB Pro component <i class="far fa-gem ml-1"></i></a></h2>
487+
<h2 class="section-heading"><strong>Floating buttons</strong> <a href="https://mdbootstrap.com/products/vue-ui-kit/" class="btn btn-danger btn-md" role="button">MDB Pro component <i class="far fa-gem ml-1"></i></a></h2>
488488

489489
<!--Section: Live preview-->
490490
<section>
@@ -535,7 +535,7 @@ <h2 class="title"><strong>Floating buttons</strong> <a href="https://mdbootstrap
535535
<section id="fixed-buttons">
536536

537537
<!--Title-->
538-
<h2 class="title"><strong>Fixed buttons</strong> <a href="https://mdbootstrap.com/products/vue-ui-kit/" class="btn btn-danger btn-md" role="button">MDB Pro component <i class="far fa-gem ml-1"></i></a></h2>
538+
<h2 class="section-heading"><strong>Fixed buttons</strong> <a href="https://mdbootstrap.com/products/vue-ui-kit/" class="btn btn-danger btn-md" role="button">MDB Pro component <i class="far fa-gem ml-1"></i></a></h2>
539539

540540
<!--Description-->
541541
<p class="description">See the live example of fixed button in the bottom right corner of this page.</p>
@@ -657,7 +657,7 @@ <h4 id=""><strong>"Back to the top" button</strong></h4>
657657
<section id="flat-button">
658658

659659
<!--Title-->
660-
<h2 class="title mb-4"><strong>Flat button </strong> <a href="https://mdbootstrap.com/products/vue-ui-kit/" class="btn btn-danger btn-md" role="button">MDB Pro component <i class="far fa-gem ml-1"></i></a></h2>
660+
<h2 class="section-heading mb-4"><strong>Flat button </strong> <a href="https://mdbootstrap.com/products/vue-ui-kit/" class="btn btn-danger btn-md" role="button">MDB Pro component <i class="far fa-gem ml-1"></i></a></h2>
661661

662662

663663
<!--Section: Live preview-->
@@ -700,7 +700,7 @@ <h2 class="title mb-4"><strong>Flat button </strong> <a href="https://mdbootstra
700700
<section id="buttons-with-icons">
701701

702702
<!--Title-->
703-
<h2 class="title"><strong>Buttons with icons</strong></h2>
703+
<h2 class="section-heading"><strong>Buttons with icons</strong></h2>
704704

705705
<!--Section: Live preview-->
706706
<section>
@@ -751,7 +751,7 @@ <h2 class="title"><strong>Buttons with icons</strong></h2>
751751
<section id="button-tags">
752752

753753
<!--Title-->
754-
<h2 class="title"><strong>Button tags</strong></h2>
754+
<h2 class="section-heading"><strong>Button tags</strong></h2>
755755

756756
<!--Description-->
757757
<div class="description">
@@ -810,7 +810,7 @@ <h2 class="title"><strong>Button tags</strong></h2>
810810
<section id="sizes">
811811

812812
<!--Title-->
813-
<h2 class="title"><strong>Sizes</strong></h2>
813+
<h2 class="section-heading"><strong>Sizes</strong></h2>
814814

815815
<!--Description-->
816816
<p class="description">Fancy larger or smaller buttons? Add <code>size="lg"</code> or <code>size="sm"</code> for additional sizes.</p>
@@ -932,7 +932,7 @@ <h2 class="title"><strong>Sizes</strong></h2>
932932
<section id="active-state">
933933

934934
<!--Title-->
935-
<h2 class="title mb-4"><strong>Button states</strong></h2>
935+
<h2 class="section-heading mb-4"><strong>Button states</strong></h2>
936936

937937
<!--Subheading-->
938938
<h4 id=""><strong>Active state</strong></h4>
@@ -1038,7 +1038,7 @@ <h4 id="disabled-state"><strong>Disabled state</strong></h4>
10381038
<section id="toggle-states">
10391039

10401040
<!--Title-->
1041-
<h2 class="title"><strong>Button plugin</strong></h2>
1041+
<h2 class="section-heading"><strong>Button plugin</strong></h2>
10421042

10431043
<!--Description-->
10441044
<p class="description">Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p>

en/vue/web/docs/forms/date-picker/a.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,16 @@ <h2 class="section-heading mb-4">
321321
>
322322
</td>
323323
</tr>
324+
<tr>
325+
<td><code class="text-nowrap">v-on:close</code></td>
326+
<td><i>e</i></td>
327+
<td>
328+
Emitted on datePicker close.
329+
</td>
330+
<td>
331+
<code>&lt;mdb-date-picker @close="onClose" /&gt;</code>
332+
</td>
333+
</tr>
324334
</tbody>
325335
</table>
326336
</section>

en/vue/web/docs/forms/date-picker/o-ss.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<li class="nav-item"><a class="nav-link" href="#icon-example">Icon</a></li>
55
<li class="nav-item"><a class="nav-link" href="#default">Default settings</a></li>
66
<li class="nav-item"><a class="nav-link" href="#keyboard">Keyboard navigation</a>
7+
<li class="nav-item"><a class="nav-link" href="#date-time-picker">Date and time picker</a></li>
78
<li class="nav-item"><a class="nav-link" href="#customization">Customization</a>
89
<ul class="pl-3">
910
<li class="nav-item"><a class="nav-link" href="#strings">Strings</a></li>

en/vue/web/docs/forms/date-picker/o.html

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,74 @@ <h2 class="section-heading mb-4">
296296

297297
</section>
298298
<!--/Section: -->
299+
300+
<hr class="mt-4 mb-5">
301+
302+
<!--Section: -->
303+
<section id="date-time-picker">
304+
305+
<!--Subheading-->
306+
<h2 class="section-heading mb-4"><strong>Date and time picker</strong></h2>
307+
308+
<!--Description-->
309+
<p>You can use Date Picker and Time Picker components together to fill one input.</p>
310+
311+
<!--Section: Code-->
312+
<section>
313+
314+
<mdbsnippet>
315+
316+
<code data-lang="html" data-name="template">
317+
<template>
318+
<div>
319+
<mdb-input :value="handlePickersValue()" @click.native="$refs.datePicker.open()" />
320+
<mdb-date-picker
321+
ref="datePicker"
322+
disable-input
323+
v-model="datePickerValue"
324+
@close="$refs.timePicker.open()" />
325+
<mdb-time-picker
326+
ref="timePicker"
327+
disable-input
328+
v-model="timePickerValue" />
329+
</div>
330+
</template>
331+
</code>
332+
<code data-lang="js" data-name="script">
333+
<script>
334+
import { mdbDatePicker, mdbTimePicker, mdbInput } from 'mdbvue';
335+
export default {
336+
name: 'DatePickerPage',
337+
components: {
338+
mdbDatePicker,
339+
mdbTimePicker,
340+
mdbInput
341+
},
342+
methods: {
343+
handlePickersValue() {
344+
let output = 'Pick date and time'
345+
if (this.datePickerValue && this.timePickerValue) output = `${this.datePickerValue}, ${this.timePickerValue}`
346+
else if (this.datePickerValue) output = this.datePickerValue
347+
else if (this.timePickerValue) output = this.timePickerValue
348+
return output
349+
}
350+
},
351+
data() {
352+
return {
353+
datePickerValue: '',
354+
timePickerValue: ''
355+
}
356+
}
357+
}
358+
</script>
359+
</code>
360+
361+
</mdbsnippet>
362+
363+
</section>
364+
<!--Section: Code-->
365+
366+
</section>
299367

300368
<hr class="mt-4 mb-5">
301369

en/vue/web/docs/forms/slider/a.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,13 @@ <h2 class="section-heading mb-4">
7979
<td>Specify slider value</td>
8080
<td><code class="language-markup">&lt;mdb-range-input :value="50" ... /&gt;</code></td>
8181
</tr>
82+
<tr>
83+
<td><code class="highlighter-rouge">v-model</code></td>
84+
<td><i>Number</i></td>
85+
<td><code>50</code></td>
86+
<td>Specify slider value with two-way data binding</td>
87+
<td><code class="language-markup">&lt;mdb-range-input :v-model="sliderValue" ... /&gt;</code></td>
88+
</tr>
8289
</tbody>
8390
</table>
8491

en/vue/web/docs/forms/slider/o.html

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ <h2 class="secondary-heading">
8989
<mdbsnippet>
9090
<code data-lang="html" data-name="template">
9191
<template>
92-
<mdb-range-input :min="0" :max="100" :value="50"></mdb-range-input>
92+
<mdb-range-input :min="0" :max="100" v-model="rangeValue"></mdb-range-input>
9393
</template>
9494
</code>
9595
<code data-lang="html" data-name="script">
@@ -99,6 +99,11 @@ <h2 class="secondary-heading">
9999
name: 'SelectPage',
100100
components: {
101101
mdbRangeInput
102+
},
103+
data() {
104+
return {
105+
rangeValue: 50
106+
}
102107
}
103108
}
104109
</script>
@@ -153,10 +158,10 @@ <h2 class="section-heading">
153158
<code data-lang="html" data-name="template">
154159
<template>
155160
<div>
156-
<mdb-range-input wrapperClass="my-4 w-25" :min="0" :max="100" :value="50" @getValue="getSliderValue" wrapperClassName></mdb-range-input>
157-
<mdb-range-input wrapperClass="my-4 w-50" :min="0" :max="100" :value="50" @getValue="getSliderValue" wrapperClassName></mdb-range-input>
158-
<mdb-range-input wrapperClass="my-4 w-75" :min="0" :max="100" :value="50" @getValue="getSliderValue" wrapperClassName></mdb-range-input>
159-
<mdb-range-input wrapperClass="my-4 w-100" :min="0" :max="100" :value="50" @getValue="getSliderValue" wrapperClassName></mdb-range-input>
161+
<mdb-range-input wrapperClass="my-4 w-25" :min="0" :max="100" v-model="range1Value" wrapperClassName></mdb-range-input>
162+
<mdb-range-input wrapperClass="my-4 w-50" :min="0" :max="100" v-model="range2Value" wrapperClassName></mdb-range-input>
163+
<mdb-range-input wrapperClass="my-4 w-75" :min="0" :max="100" v-model="range3Value" wrapperClassName></mdb-range-input>
164+
<mdb-range-input wrapperClass="my-4 w-100" :min="0" :max="100" v-model="range4Value" wrapperClassName></mdb-range-input>
160165
</div>
161166
</template>
162167
</code>
@@ -167,6 +172,14 @@ <h2 class="section-heading">
167172
name: 'SelectPage',
168173
components: {
169174
mdbRangeInput
175+
},
176+
data() {
177+
return {
178+
range1Value: 50,
179+
range2Value: 50,
180+
range3Value: 50,
181+
range4Value: 50
182+
}
170183
}
171184
}
172185
</script>
@@ -229,16 +242,16 @@ <h2 class="section-heading">
229242
<template>
230243
<div>
231244
<div class="d-flex justify-content-center my-4">
232-
<mdb-range-input wrapperClass="my-4 w-25" :min="20" :max="50" :value="25" @getValue="getSliderValue" wrapperClassName></mdb-range-input>
245+
<mdb-range-input wrapperClass="my-4 w-25" :min="20" :max="50" v-model="slider1Value" wrapperClassName></mdb-range-input>
233246
</div>
234247
<div class="d-flex justify-content-center my-4">
235-
<mdb-range-input wrapperClass="my-4 w-50" :min="0" :max="40" :value="40" @getValue="getSliderValue" wrapperClassName></mdb-range-input>
248+
<mdb-range-input wrapperClass="my-4 w-50" :min="0" :max="40" v-model="slider2Value" wrapperClassName></mdb-range-input>
236249
</div>
237250
<div class="d-flex justify-content-center my-4">
238-
<mdb-range-input wrapperClass="my-4 w-75" :min="0" :max="100" :value="0" @getValue="getSliderValue" wrapperClassName></mdb-range-input>
251+
<mdb-range-input wrapperClass="my-4 w-75" :min="0" :max="100" v-model="slider3Value" wrapperClassName></mdb-range-input>
239252
</div>
240253
<div class="d-flex justify-content-center my-4">
241-
<mdb-range-input wrapperClass="my-4 w-100" :min="40" :max="100" :value="50" @getValue="getSliderValue" wrapperClassName></mdb-range-input>
254+
<mdb-range-input wrapperClass="my-4 w-100" :min="40" :max="100" v-model="slider4Value" wrapperClassName></mdb-range-input>
242255
</div>
243256
</div>
244257
</template>
@@ -250,6 +263,14 @@ <h2 class="section-heading">
250263
name: 'SelectPage',
251264
components: {
252265
mdbRangeInput
266+
},
267+
data() {
268+
return {
269+
range1Value: 25,
270+
range2Value: 40,
271+
range3Value: 0,
272+
range4Value: 50
273+
}
253274
}
254275
}
255276
</script>

en/vue/web/docs/forms/switch/a.html

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,35 +49,42 @@ <h2 class="section-heading mb-4">
4949
<td><i>Boolean</i></td>
5050
<td><code>false</code></td>
5151
<td>Turn the switch on</td>
52-
<td><code class="language-markup">&lt;mdb-switch-input checked ... /&gt;</code></td>
52+
<td><code class="language-markup">&lt;mdb-switch checked ... /&gt;</code></td>
5353
</tr>
5454
<tr>
5555
<td><code class="highlighter-rouge">disabled</code></td>
5656
<td><i>Boolean</i></td>
5757
<td><code>false</code></td>
5858
<td>Disable input</td>
59-
<td><code class="language-markup">&lt;mdb-switch-input disabled ... /&gt;</code></td>
59+
<td><code class="language-markup">&lt;mdb-switch disabled ... /&gt;</code></td>
6060
</tr>
6161
<tr>
6262
<td><code class="highlighter-rouge">classes</code></td>
6363
<td><i>String</i></td>
6464
<td><code></code></td>
6565
<td>Override or extend the styles applied to the component.</td>
66-
<td><code class="language-markup">&lt;mdb-switch-input classes="..." ... /&gt;</code></td>
66+
<td><code class="language-markup">&lt;mdb-switch classes="..." ... /&gt;</code></td>
6767
</tr>
6868
<tr>
6969
<td><code class="highlighter-rouge">offLabel</code></td>
7070
<td><i>String</i></td>
7171
<td><code>Off</code></td>
7272
<td>Label for false event</td>
73-
<td><code class="language-markup">&lt;mdb-switch-input offLabel="Off" ... /&gt;</code></td>
73+
<td><code class="language-markup">&lt;mdb-switch offLabel="Off" ... /&gt;</code></td>
7474
</tr>
7575
<tr>
7676
<td><code class="highlighter-rouge">onLabel</code></td>
7777
<td><i>String</i></td>
7878
<td><code>On</code></td>
7979
<td>Label for false event</td>
80-
<td><code class="language-markup">&lt;mdb-switch-input onLabel="On" ... /&gt;</code></td>
80+
<td><code class="language-markup">&lt;mdb-switch onLabel="On" ... /&gt;</code></td>
81+
</tr>
82+
<tr>
83+
<td><code class="highlighter-rouge">v-model</code></td>
84+
<td><i>Boolean</i></td>
85+
<td><code>false</code></td>
86+
<td>Switch value</td>
87+
<td><code class="language-markup">&lt;mdb-switch v-model="switchValue" ... /&gt;</code></td>
8188
</tr>
8289
</tbody>
8390
</table>
@@ -109,10 +116,10 @@ <h2 class="section-heading mb-4">
109116
</thead>
110117
<tbody>
111118
<tr>
112-
<td><code style="word-break: normal">v-on:getValue</code></td>
119+
<td><code class="text-nowrap">v-on:getValue</code></td>
113120
<td><i>value</i></td>
114121
<td>Returns input value. Use this method instead of v-model to handle input value changes.</td>
115-
<td><code class="language-markup">&lt;mdb-switch-input @getValue="getSwitchValue" /&gt;</code></td>
122+
<td><code class="language-markup">&lt;mdb-switch @getValue="getSwitchValue" /&gt;</code></td>
116123
</tr>
117124
</tbody>
118125
</table>

0 commit comments

Comments
 (0)