Skip to content

Commit 3334de6

Browse files
committed
Merge branch 'master' of github.com:mdbootstrap/mdb-docs-and-content into arek
2 parents 3f2118c + 3c1f43c commit 3334de6

File tree

57 files changed

+8386
-2237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+8386
-2237
lines changed

en/angular/web/docs/components/cards/a.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ <h2 class="section-heading mb-4">
2828
</p>
2929

3030
<pre><code class="language-javascript">// MDB Angular Pro
31-
import { ButtonsModule, WavesModule, CardsFreeModule } from 'ng-uikit-pro-standard'</code></pre>
31+
import { ButtonsModule, WavesModule, CardsModule } from 'ng-uikit-pro-standard'</code></pre>
3232
<pre><code class="language-javascript">// MDB Angular Pro
33-
import { ButtonsModule, WavesModule, CardsFreeModule } from 'angular-bootstrap-md'</code></pre>
33+
import { ButtonsModule, WavesModule, CardsModule } from 'angular-bootstrap-md'</code></pre>
3434
<div class="row">
3535
<div class="col-md-6">
3636
<a class="btn btn-primary waves-light mx-2" href="https://mdbootstrap.com/docs/angular/getting-started/importing-modules/"

en/angular/web/docs/forms/contact-form/o.html

Lines changed: 125 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -321,43 +321,116 @@ <h5>
321321

322322
<mdb-card-body class="px-lg-5 pt-0">
323323

324-
<form class="text-center" style="color: #757575;" [formGroup]="contactForm" (ngSubmit)="onSubmit()">
325-
326-
<div class="md-form mt-3">
327-
<input type="text" formControlName="contactFormName" id="materialContactFormName" class="form-control"
328-
mdbInput>
329-
<label for="materialContactFormName">Name</label>
330-
</div>
331-
332-
<div class="md-form">
333-
<input type="email" formControlName="contactFormEmail" id="materialContactFormEmail" class="form-control"
334-
mdbInput>
335-
<label for="materialContactFormEmail">E-mail</label>
336-
</div>
337-
338-
<span>Subject</span>
339-
<div class="row">
340-
<div class="col-md-12 mx-auto">
341-
<mdb-select formControlName="contactFormSubjects" [options]="optionsSelect" placeholder="Choose your option"></mdb-select>
324+
<form
325+
class="text-center"
326+
style="color: #757575;"
327+
[formGroup]="contactForm"
328+
(ngSubmit)="onSubmit()"
329+
>
330+
<div class="md-form mt-3">
331+
<input
332+
type="text"
333+
formControlName="contactFormName"
334+
id="materialContactFormName"
335+
class="form-control"
336+
mdbInput
337+
mdbValidate
338+
/>
339+
<label for="materialContactFormName">Name</label>
340+
<mdb-error *ngIf="name.invalid && (name.dirty || name.touched)"
341+
>Input invalid</mdb-error
342+
>
343+
<mdb-success *ngIf="name.valid && (name.dirty || name.touched)"
344+
>Input valid</mdb-success
345+
>
346+
</div>
347+
348+
<div class="md-form">
349+
<input
350+
type="email"
351+
formControlName="contactFormEmail"
352+
id="materialContactFormEmail"
353+
class="form-control"
354+
mdbInput
355+
mdbValidate
356+
/>
357+
<label for="materialContactFormEmail">E-mail</label>
358+
<mdb-error *ngIf="email.invalid && (email.dirty || email.touched)"
359+
>Input invalid</mdb-error
360+
>
361+
<mdb-success *ngIf="email.valid && (email.dirty || email.touched)"
362+
>Input valid</mdb-success
363+
>
364+
</div>
365+
366+
<span>Subject</span>
367+
<div class="row">
368+
<div class="col-md-12 mx-auto">
369+
<div class="md-form">
370+
<mdb-select
371+
formControlName="contactFormSubjects"
372+
[options]="optionsSelect"
373+
placeholder="Choose your option"
374+
mdbValidate
375+
></mdb-select>
376+
<mdb-error *ngIf="subjects.invalid && (subjects.dirty || subjects.touched)"
377+
>Input invalid</mdb-error
378+
>
379+
<mdb-success *ngIf="subjects.valid && (subjects.dirty || subjects.touched)"
380+
>Input valid</mdb-success
381+
>
342382
</div>
343383
</div>
344-
345-
<div class="md-form">
346-
<textarea type="text" formControlName="contactFormMessage" id="materialContactFormMessage" class="form-control md-textarea"
347-
mdbInput></textarea>
348-
<label for="materialContactFormMessage">Message</label>
349-
</div>
350-
351-
<div class="row">
352-
<div class="col-md-6 mx-auto d-flex justify-content-center">
353-
<mdb-checkbox formControlName="contactFormCopy">Send me a copy of this message</mdb-checkbox>
384+
</div>
385+
386+
<div class="md-form">
387+
<textarea
388+
type="text"
389+
formControlName="contactFormMessage"
390+
id="materialContactFormMessage"
391+
class="form-control md-textarea"
392+
mdbInput
393+
mdbValidate
394+
></textarea>
395+
<label for="materialContactFormMessage">Message</label>
396+
<mdb-error *ngIf="message.invalid && (message.dirty || message.touched)"
397+
>Input invalid</mdb-error
398+
>
399+
<mdb-success *ngIf="message.valid && (message.dirty || message.touched)"
400+
>Input valid</mdb-success
401+
>
402+
</div>
403+
404+
<div class="row">
405+
<div class="col-md-6 mx-auto d-flex justify-content-center">
406+
<div class="md-form">
407+
<mdb-checkbox mdbValidate formControlName="contactFormCopy"
408+
>Send me a copy of this message</mdb-checkbox
409+
>
410+
<mdb-error *ngIf="copy.invalid && (copy.dirty || copy.touched)"
411+
>Input invalid</mdb-error
412+
>
413+
<mdb-success *ngIf="copy.valid && (copy.dirty || copy.touched)"
414+
>Input valid</mdb-success
415+
>
354416
</div>
355417
</div>
356-
357-
<button mdbBtn color="info" outline="true" rounded="true" block="true" class="z-depth-0 my-4 waves-effect"
358-
mdbWavesEffect type="submit" [disabled]="disabledSubmitButton">Send</button>
359-
360-
</form>
418+
</div>
419+
420+
<button
421+
mdbBtn
422+
color="info"
423+
outline="true"
424+
rounded="true"
425+
block="true"
426+
class="z-depth-0 my-4 waves-effect"
427+
mdbWavesEffect
428+
type="submit"
429+
[disabled]="disabledSubmitButton"
430+
>
431+
Send
432+
</button>
433+
</form>
361434

362435
</mdb-card-body>
363436

@@ -388,14 +461,14 @@ <h5>
388461
}
389462
}
390463

391-
constructor(private fb: FormBuilder, private connectionService: ConnectionService) {
464+
constructor(fb: FormBuilder, private connectionService: ConnectionService) {
392465

393466
this.contactForm = fb.group({
394467
'contactFormName': ['', Validators.required],
395468
'contactFormEmail': ['', Validators.compose([Validators.required, Validators.email])],
396469
'contactFormSubjects': ['', Validators.required],
397470
'contactFormMessage': ['', Validators.required],
398-
'contactFormCopy': [''],
471+
'contactFormCopy': ['', Validators.requiredTrue],
399472
});
400473
}
401474

@@ -409,12 +482,28 @@ <h5>
409482
];
410483
}
411484

485+
get name() {
486+
return this.contactForm.get('contactFormName');
487+
}
488+
get email() {
489+
return this.contactForm.get('contactFormEmail');
490+
}
491+
get subjects() {
492+
return this.contactForm.get('contactFormSubjects');
493+
}
494+
get message() {
495+
return this.contactForm.get('contactFormMessage');
496+
}
497+
get copy() {
498+
return this.contactForm.get('contactFormCopy');
499+
}
500+
412501
onSubmit() {
413502
this.connectionService.sendMessage(this.contactForm.value).subscribe(() => {
414503
alert('Your message has been sent.');
415504
this.contactForm.reset();
416505
this.disabledSubmitButton = true;
417-
}, error => {
506+
}, (error: any) => {
418507
console.log('Error', error);
419508
});
420509
}

en/angular/web/docs/navigation/navigation/o.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h2 class="section-heading">Regular fixed Navbar</h2>
4444
<section>
4545
<mdbsnippet>
4646
<code data-lang="html" data-name="HTML">
47-
<mdb-navbar SideClass="navbar navbar-expand-lg navbar-dark pink ie-nav" [containerInside]="false">
47+
<mdb-navbar SideClass="navbar navbar-expand-lg navbar-dark pink ie-nav fixed-top" [containerInside]="false">
4848
<mdb-navbar-brand>
4949
<a class="logo navbar-brand" href="#"><strong>Navbar</strong></a>
5050
</mdb-navbar-brand>

en/jquery/web/docs/components/steppers/a.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ <h2 class="section-heading mb-4">
7575
<p>Then, below the linked CSS files add Stepper file.</p>
7676

7777
<pre class="code-toolbar" data-editor="false"><code class="language-markup">
78-
&lt;!-- MDBootstrap Steppers Pro --&gt;&#10;&lt;link href=&quot;css/addons-pro/stepper.min.css&quot; rel=&quot;stylesheet&quot;&gt;
78+
&lt;!-- MDBootstrap Steppers Pro --&gt;&#10;&lt;link href=&quot;css/addons-pro/steppers.min.css&quot; rel=&quot;stylesheet&quot;&gt;
7979
</code></pre>
8080

8181
<p>Next, below the linked JavaScript files add Steppers file.</p>
8282

8383
<pre class="code-toolbar" data-editor="false"><code class="language-markup">
84-
&lt;!-- MDBootstrap Steppers Pro --&gt;&#10;&lt;script type=&quot;text/javascript&quot; src=&quot;js/addons-pro/stepper.min.js&quot;&gt;&lt;/script&gt;
84+
&lt;!-- MDBootstrap Steppers Pro --&gt;&#10;&lt;script type=&quot;text/javascript&quot; src=&quot;js/addons-pro/steppers.min.js&quot;&gt;&lt;/script&gt;
8585
</code></pre>
8686

8787
<p><strong class="font-weight-bold">Note:</strong><strong>Do not forget about initializing Steppers Pro.</strong></p>

en/jquery/web/docs/components/steppers/o.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ <h4 class="my-4"><strong>Paths and initialization code are below:</strong></h4>
8282
<link href="css/addons-pro/steppers.min.css" rel="stylesheet">
8383

8484
<!-- Stepper JavaScript -->
85-
<script type="text/javascript" src="js/addons-pro/stepper.js"></script>
85+
<script type="text/javascript" src="js/addons-pro/steppers.js"></script>
8686
<!-- Stepper JavaScript - minified -->
87-
<script type="text/javascript" src="js/addons-pro/stepper.min.js"></script>
87+
<script type="text/javascript" src="js/addons-pro/steppers.min.js"></script>
8888
</code>
8989

9090
<code data-lang="js" data-name="JavaScript">

en/jquery/web/docs/css/animations/js.html

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,46 @@
11
<script>
2-
function testAnim(x) {
3-
$('#animationSandbox').removeClass().addClass(x + ' animated').one(
4-
'webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend',
5-
function () {
6-
$(this).removeClass();
7-
});
8-
};
9-
102
$(document).ready(function () {
3+
function testAnim(x) {
4+
$('#animationSandbox').removeClass().addClass(x + ' animated').one(
5+
'webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend',
6+
function () {
7+
$(this).removeClass();
8+
});
9+
};
10+
1111
$('.js--triggerAnimation').click(function (e) {
1212
e.preventDefault();
1313
var anim = $('.js--animations').val();
1414
testAnim(anim);
1515
});
1616

17-
$('.js--animations').change(function () {
17+
$('.js--animations').change(function (e) {
18+
e.stopPropagation();
1819
var anim = $(this).val();
1920
testAnim(anim);
2021
});
21-
});
2222

23-
function testAnim1(x) {
24-
$('#animationSandbox1').removeClass().addClass(x + ' animated' + ' bounce').one(
25-
'webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend',
26-
function () {
27-
$(this).removeClass();
28-
});
29-
};
23+
function testAnim1(x) {
24+
$('#animationSandbox1').removeClass().addClass(x + ' animated' + ' bounce').one(
25+
'webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend',
26+
function () {
27+
$(this).removeClass();
28+
});
29+
};
3030

31-
$(document).ready(function () {
3231
$('.js--triggerAnimation').click(function (e) {
3332
e.preventDefault();
3433
var anim = $('.js--animations').val();
3534
testAnim1(anim);
3635
});
3736

38-
$('.js--animations').change(function () {
37+
$('.js--animations').change(function (e) {
38+
e.stopPropagation();
3939
var anim = $(this).val();
4040
testAnim1(anim);
4141
});
42-
});
4342

44-
$(document).ready(function () {
45-
$('select').material_select();
43+
$('select').materialSelect();
4644
wow = new WOW({
4745
boxClass: 'wow', // default
4846
animateClass: 'animated', // default
@@ -52,6 +50,7 @@
5250
});
5351
wow.init();
5452
});
53+
5554
</script>
5655

5756
<!-- Structured data: Breadcrumbs -->

en/jquery/web/docs/css/skins/o-ss.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
<li class="nav-item"><a class="nav-link" href="#light-blue">Light blue</a></li>
1111
<li class="nav-item"><a class="nav-link" href="#grey">Grey</a></li>
1212
<li class="nav-item"><a class="nav-link" href="#custom">Add custom skin</a></li>
13+
<li class="nav-item"><a class="nav-link" href="#skins-description">Skins variables</a></li>

0 commit comments

Comments
 (0)