Skip to content
This repository was archived by the owner on Dec 3, 2021. It is now read-only.

Commit 12cf512

Browse files
xidedixxidedix
authored
Merge pull request #12 from coreui/fix-accordion
refactor: minor updates
2 parents 61aeefb + 782c3f2 commit 12cf512

File tree

9 files changed

+94
-88
lines changed

9 files changed

+94
-88
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## v2.1.next
2+
- fix(collapse): add `mb-0` to accordion cards
3+
- refactor(forms): add `autocomplete`
4+
- refactor(modals): add `mb-1` to buttons
5+
- update: `stylelint` to `9.9.0`
6+
17
## v2.1.9
28
- update: `@coreui/coreui` to `2.1.3`
39
- update: `popper.js` to `1.14.5`

‎package-lock.json

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"pug": "^2.0.3",
101101
"rimraf": "^2.6.2",
102102
"shelljs": "^0.8.3",
103-
"stylelint": "^9.8.0",
103+
"stylelint": "^9.9.0",
104104
"stylelint-config-recommended-scss": "^3.2.0",
105105
"stylelint-config-standard": "^18.2.0",
106106
"stylelint-order": "^2.0.0",

‎pug/views/base/collapse.pug

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ block view
2323
.card
2424
.card-header
2525
i.fa.fa-align-justify
26-
| Collapse
26+
| Collapse
2727
small multiple targets
2828
.card-body
2929
p
@@ -43,27 +43,27 @@ block view
4343
.card
4444
.card-header
4545
i.fa.fa-align-justify
46-
| Collapse
46+
| Collapse
4747
small accordion
4848
.card-body
4949
#accordion(role='tablist')
50-
.card
50+
.card.mb-0
5151
#headingOne.card-header(role='tab')
5252
h5.mb-0
5353
a(data-toggle='collapse', href='#collapseOne', aria-expanded='true', aria-controls='collapseOne')
5454
| Collapsible Group Item #1
5555
#collapseOne.collapse.show(role='tabpanel', aria-labelledby='headingOne', data-parent='#accordion')
5656
.card-body
5757
| Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
58-
.card
58+
.card.mb-0
5959
#headingTwo.card-header(role='tab')
6060
h5.mb-0
6161
a.collapsed(data-toggle='collapse', href='#collapseTwo', aria-expanded='false', aria-controls='collapseTwo')
6262
| Collapsible Group Item #2
6363
#collapseTwo.collapse(role='tabpanel', aria-labelledby='headingTwo', data-parent='#accordion')
6464
.card-body
6565
| Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
66-
.card
66+
.card.mb-0
6767
#headingThree.card-header(role='tab')
6868
h5.mb-0
6969
a.collapsed(data-toggle='collapse', href='#collapseThree', aria-expanded='false', aria-controls='collapseThree')
@@ -74,7 +74,7 @@ block view
7474
.card
7575
.card-header
7676
i.fa.fa-align-justify
77-
| Collapse
77+
| Collapse
7878
small custom accordion
7979
.card-body
8080
#exampleAccordion(data-children='.item')

‎pug/views/base/forms.pug

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ block view
106106
.form-group.row
107107
label.col-md-3.col-form-label(for='email-input') Email Input
108108
.col-md-9
109-
input#email-input.form-control(type='email', name='email-input', placeholder='Enter Email')
109+
input#email-input.form-control(type='email', name='email-input', placeholder='Enter Email' autocomplete='email')
110110
span.help-block Please enter your email
111111
.form-group.row
112112
label.col-md-3.col-form-label(for='password-input') Password
113113
.col-md-9
114-
input#password-input.form-control(type='password', name='password-input', placeholder='Password')
114+
input#password-input.form-control(type='password', name='password-input', placeholder='Password' autocomplete='new-password')
115115
span.help-block Please enter a complex password
116116
.form-group.row
117117
label.col-md-3.col-form-label(for='date-input') Date Input
@@ -248,11 +248,11 @@ block view
248248
.card-body
249249
form.form-inline(action='', method='post')
250250
.form-group
251-
label(for='exampleInputName2') Name
252-
input#exampleInputName2.form-control(type='text', placeholder='Jane Doe')
251+
label.mr-1(for='exampleInputName2') Name
252+
input#exampleInputName2.form-control(type='text', placeholder='Jane Doe' autocomplete='name')
253253
.form-group
254-
label(for='exampleInputEmail2') Email
255-
input#exampleInputEmail2.form-control(type='email', placeholder='[email protected]')
254+
label.mx-1(for='exampleInputEmail2') Email
255+
input#exampleInputEmail2.form-control(type='email', placeholder='[email protected]' autocomplete='email')
256256
.card-footer
257257
button.btn.btn-sm.btn-primary(type='submit')
258258
i.fa.fa-dot-circle-o
@@ -270,12 +270,12 @@ block view
270270
.form-group.row
271271
label.col-md-3.col-form-label(for='hf-email') Email
272272
.col-md-9
273-
input#hf-email.form-control(type='email', name='hf-email', placeholder='Enter Email..')
273+
input#hf-email.form-control(type='email', name='hf-email', placeholder='Enter Email..' autocomplete='email')
274274
span.help-block Please enter your email
275275
.form-group.row
276276
label.col-md-3.col-form-label(for='hf-password') Password
277277
.col-md-9
278-
input#hf-password.form-control(type='password', name='hf-password', placeholder='Enter Password..')
278+
input#hf-password.form-control(type='password', name='hf-password', placeholder='Enter Password..' autocomplete='current-password')
279279
span.help-block Please enter your password
280280
.card-footer
281281
button.btn.btn-sm.btn-primary(type='submit')
@@ -292,11 +292,11 @@ block view
292292
form(action='', method='post')
293293
.form-group
294294
label(for='nf-email') Email
295-
input#nf-email.form-control(type='email', name='nf-email', placeholder='Enter Email..')
295+
input#nf-email.form-control(type='email', name='nf-email', placeholder='Enter Email..' autocomplete='email')
296296
span.help-block Please enter your email
297297
.form-group
298298
label(for='nf-password') Password
299-
input#nf-password.form-control(type='password', name='nf-password', placeholder='Enter Password..')
299+
input#nf-password.form-control(type='password', name='nf-password', placeholder='Enter Password..' autocomplete='current-password')
300300
span.help-block Please enter your password
301301
.card-footer
302302
button.btn.btn-sm.btn-primary(type='submit')
@@ -421,11 +421,11 @@ block view
421421
.input-group-prepend
422422
span.input-group-text
423423
i.fa.fa-user
424-
input#input1-group1.form-control(type='text', name='input1-group1', placeholder='Username')
424+
input#input1-group1.form-control(type='text', name='input1-group1', placeholder='Username' autocomplete='username')
425425
.form-group.row
426426
.col-md-12
427427
.input-group
428-
input#input2-group1.form-control(type='email', name='input2-group1', placeholder='Email')
428+
input#input2-group1.form-control(type='email', name='input2-group1', placeholder='Email' autocomplete='email')
429429
.input-group-append
430430
span.input-group-text
431431
i.fa.fa-envelope-o
@@ -459,11 +459,11 @@ block view
459459
button.btn.btn-primary(type='button')
460460
i.fa.fa-search
461461
| Search
462-
input#input1-group2.form-control(type='text', name='input1-group2', placeholder='Username')
462+
input#input1-group2.form-control(type='text', name='input1-group2', placeholder='Username' autocomplete='username')
463463
.form-group.row
464464
.col-md-12
465465
.input-group
466-
input#input2-group2.form-control(type='email', name='input2-group2', placeholder='Email')
466+
input#input2-group2.form-control(type='email', name='input2-group2', placeholder='Email' autocomplete='email')
467467
span.input-group-append
468468
button.btn.btn-primary(type='button') Submit
469469
.form-group.row
@@ -503,11 +503,11 @@ block view
503503
a.dropdown-item(href='#') Something else here
504504
.dropdown-divider(role='separator')
505505
a.dropdown-item(href='#') Separated link
506-
input#input1-group3.form-control(type='text', name='input1-group3', placeholder='Username')
506+
input#input1-group3.form-control(type='text', name='input1-group3', placeholder='Username' autocomplete='username')
507507
.form-group.row
508508
.col-md-12
509509
.input-group
510-
input#input2-group3.form-control(type='email', name='input2-group3', placeholder='Email')
510+
input#input2-group3.form-control(type='email', name='input2-group3', placeholder='Email' autocomplete='email')
511511
.input-group-append
512512
button.btn.btn-primary.dropdown-toggle(type='button', data-toggle='dropdown')
513513
| Action
@@ -640,23 +640,23 @@ block view
640640
.input-group
641641
.input-group-prepend
642642
span.input-group-text Username
643-
input#username3.form-control(type='text', name='username3')
643+
input#username3.form-control(type='text', name='username3' autocomplete='username')
644644
.input-group-append
645645
span.input-group-text
646646
i.fa.fa-user
647647
.form-group
648648
.input-group
649649
.input-group-prepend
650650
span.input-group-text Email
651-
input#email3.form-control(type='email', name='email3')
651+
input#email3.form-control(type='email', name='email3' autocomplete='email')
652652
.input-group-append
653653
span.input-group-text
654654
i.fa.fa-envelope
655655
.form-group
656656
.input-group
657657
.input-group-prepend
658658
span.input-group-text Password
659-
input#password3.form-control(type='password', name='password3')
659+
input#password3.form-control(type='password', name='password3' autocomplete='new-password')
660660
.input-group-append
661661
span.input-group-text
662662
i.fa.fa-asterisk
@@ -670,19 +670,19 @@ block view
670670
form(action='', method='post')
671671
.form-group
672672
.input-group
673-
input#username2.form-control(type='text', name='username2', placeholder='Username')
673+
input#username2.form-control(type='text', name='username2', placeholder='Username' autocomplete='username')
674674
.input-group-append
675675
span.input-group-text
676676
i.fa.fa-user
677677
.form-group
678678
.input-group
679-
input#email2.form-control(type='email', name='email2', placeholder='Email')
679+
input#email2.form-control(type='email', name='email2', placeholder='Email' autocomplete='email')
680680
.input-group-append
681681
span.input-group-text
682682
i.fa.fa-envelope
683683
.form-group
684684
.input-group
685-
input#password2.form-control(type='password', name='password2', placeholder='Password')
685+
input#password2.form-control(type='password', name='password2', placeholder='Password' autocomplete='new-password')
686686
.input-group-append
687687
span.input-group-text
688688
i.fa.fa-asterisk
@@ -699,19 +699,19 @@ block view
699699
.input-group-prepend
700700
span.input-group-text
701701
i.fa.fa-user
702-
input#username.form-control(type='text', name='username', placeholder='Username')
702+
input#username.form-control(type='text', name='username', placeholder='Username' autocomplete='username')
703703
.form-group
704704
.input-group
705705
.input-group-prepend
706706
span.input-group-text
707707
i.fa.fa-envelope
708-
input#email.form-control(type='email', name='email', placeholder='Email')
708+
input#email.form-control(type='email', name='email', placeholder='Email' autocomplete='email')
709709
.form-group
710710
.input-group
711711
.input-group-prepend
712712
span.input-group-text
713713
i.fa.fa-asterisk
714-
input#password.form-control(type='password', name='password', placeholder='Password')
714+
input#password.form-control(type='password', name='password', placeholder='Password' autocomplete='new-password')
715715
.form-group.form-actions
716716
button.btn.btn-sm.btn-success(type='submit') Submit
717717
// /.row

‎pug/views/notifications/modals.pug

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ block view
1010
| Bootstrap Modals
1111
.card-body
1212
// Button trigger modal
13-
button.btn.btn-secondary(type='button', data-toggle='modal', data-target='#myModal')
13+
button.btn.btn-secondary.mb-1(type='button', data-toggle='modal', data-target='#myModal')
1414
| Launch demo modal
15-
button.btn.btn-secondary(type='button', data-toggle='modal', data-target='#largeModal')
15+
button.btn.btn-secondary.mb-1(type='button', data-toggle='modal', data-target='#largeModal')
1616
| Launch large modal
17-
button.btn.btn-secondary(type='button', data-toggle='modal', data-target='#smallModal')
17+
button.btn.btn-secondary.mb-1(type='button', data-toggle='modal', data-target='#smallModal')
1818
| Launch small modal
1919
hr
20-
button.btn.btn-primary(type='button', data-toggle='modal', data-target='#primaryModal')
20+
button.btn.btn-primary.mb-1(type='button', data-toggle='modal', data-target='#primaryModal')
2121
| Primary modal
22-
button.btn.btn-success(type='button', data-toggle='modal', data-target='#successModal')
22+
button.btn.btn-success.mb-1(type='button', data-toggle='modal', data-target='#successModal')
2323
| Success modal
24-
button.btn.btn-warning(type='button', data-toggle='modal', data-target='#warningModal')
24+
button.btn.btn-warning.mb-1(type='button', data-toggle='modal', data-target='#warningModal')
2525
| Warning modal
26-
button.btn.btn-danger(type='button', data-toggle='modal', data-target='#dangerModal')
26+
button.btn.btn-danger.mb-1(type='button', data-toggle='modal', data-target='#dangerModal')
2727
| Danger modal
28-
button.btn.btn-info(type='button', data-toggle='modal', data-target='#infoModal')
28+
button.btn.btn-info.mb-1(type='button', data-toggle='modal', data-target='#infoModal')
2929
| Info modal
3030
// /.col
3131
// /.row

0 commit comments

Comments
 (0)