Skip to content

Commit 0aa7044

Browse files
DPTeamMemberDPTeamMember
authored
Merge pull request #261 from puikinsh/Bootstrap5-Update
Bootstrap5 update
2 parents eb3938a + 9fd44e2 commit 0aa7044

28 files changed

+479
-356
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@
66

77
#### 1.1.0
88

9-
- Upgrade to webpack 5
9+
- Upgrade to webpack 5
10+
11+
#### 2.0.0
12+
13+
- Upgrade to Bootstrap 5

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Adminator HTML5 Admin Template
2-
**Adminator** is a responsive Bootstrap 4 Admin Template. It provides you with a collection of ready to use code snippets and utilities, custom pages, a collection of applications and some useful widgets. Preview of this awesome admin template available here: https://colorlib.com/polygon/adminator/index.html
2+
**Adminator** is a responsive Bootstrap 5 Admin Template. It provides you with a collection of ready to use code snippets and utilities, custom pages, a collection of applications and some useful widgets. Preview of this awesome admin template available here: https://colorlib.com/polygon/adminator/index.html
33

44
# Preview
55

‎forms.php

Lines changed: 66 additions & 66 deletions
Large diffs are not rendered by default.

‎package.json

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "adminator",
3-
"version": "1.1.0",
3+
"version": "2.0.0",
44
"private": true,
55
"description": "HTML Admin Template",
66
"scripts": {
@@ -20,6 +20,7 @@
2020
"@babel/plugin-proposal-object-rest-spread": "^7.13.8",
2121
"@babel/plugin-transform-runtime": "^7.13.9",
2222
"@babel/runtime": "^7.13.9",
23+
"@popperjs/core": "^2.9.2",
2324
"babel-core": "^6.26.3",
2425
"babel-loader": "^8.2.2",
2526
"babel-preset-env": "^1.7.0",
@@ -30,16 +31,16 @@
3031
"css-loader": "^5.2.6",
3132
"eslint": "^7.21.0",
3233
"eslint-config-airbnb-base": "^14.2.1",
33-
"eslint-plugin-import": "2.22.1",
34+
"eslint-plugin-import": "^2.23.4",
3435
"extract-text-webpack-plugin": "^3.0.2",
3536
"html-webpack-plugin": "^5.3.1",
3637
"imagemin-webpack-plugin": "^2.4.2",
3738
"mini-css-extract-plugin": "^1.6.0",
3839
"node-sass": "^4.14.1",
39-
"postcss": "^8.3.0",
40-
"postcss-loader": "^5.3.0",
40+
"postcss": "^8.3.4",
41+
"postcss-loader": "^6.1.0",
4142
"postcss-preset-env": "^6.7.0",
42-
"sass-loader": "^11.1.1",
43+
"sass-loader": "^12.1.0",
4344
"shx": "^0.3.3",
4445
"style-loader": "^2.0.0",
4546
"stylelint": "^13.13.1",
@@ -50,30 +51,28 @@
5051
"webpack-dev-server": "^3.11.2"
5152
},
5253
"dependencies": {
53-
"@fullcalendar/core": "^5.7.0",
54-
"@fullcalendar/daygrid": "^5.7.0",
55-
"@fullcalendar/interaction": "^5.7.0",
56-
"@fullcalendar/list": "^5.7.0",
57-
"@fullcalendar/timegrid": "^5.7.0",
58-
"@popperjs/core": "^2.9.2",
54+
"@fullcalendar/core": "^5.7.2",
55+
"@fullcalendar/daygrid": "^5.7.2",
56+
"@fullcalendar/interaction": "^5.7.2",
57+
"@fullcalendar/list": "^5.7.2",
58+
"@fullcalendar/timegrid": "^5.7.2",
5959
"babel-polyfill": "^6.26.0",
60-
"bootstrap": "^4.6.0",
60+
"bootstrap": "^5.0.1",
6161
"bootstrap-datepicker": "^1.9.0",
6262
"brand-colors": "^2.1.1",
6363
"chart.js": "^2.9.4",
6464
"datatables": "^1.10.18",
6565
"easy-pie-chart": "^2.1.7",
6666
"file-loader": "^6.2.0",
67-
"fullcalendar": "^5.7.0",
67+
"fullcalendar": "^5.7.2",
6868
"jquery": "^3.6.0",
6969
"jquery-sparkline": "^2.4.0",
7070
"jvectormap": "^2.0.4",
7171
"load-google-maps-api": "^2.0.2",
7272
"lodash": "^4.17.21",
7373
"masonry-layout": "^4.2.2",
7474
"moment": "^2.29.1",
75-
"perfect-scrollbar": "^1.5.0",
76-
"popper.js": "^1.16.1",
75+
"perfect-scrollbar": "^1.5.1",
7776
"skycons": "^1.0.0"
7877
}
7978
}

‎src/assets/scripts/fullcalendar/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as $ from 'jquery';
21
import { Calendar } from '@fullcalendar/core';
32
import interactionPlugin from '@fullcalendar/interaction';
43
import dayGridPlugin from '@fullcalendar/daygrid';

‎src/assets/scripts/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
import '../styles/index.scss';
1+
// import "@popperjs/core";
2+
import bootstrap from 'bootstrap';
23

4+
import '../styles/index.scss';
5+
import './fullcalendar';
36
import './masonry';
47
import './charts';
58
import './popover';
@@ -12,6 +15,5 @@ import './chat';
1215
import './datatable';
1316
import './datepicker';
1417
import './email';
15-
import './fullcalendar';
1618
import './googleMaps';
1719
import './utils';

‎src/assets/scripts/popover/index.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
import * as $ from 'jquery';
2-
import 'bootstrap';
1+
// import * as $ from 'jquery';
2+
import * as bootstrap from 'bootstrap'
33

44
export default (function () {
55
// ------------------------------------------------------
66
// @Popover
77
// ------------------------------------------------------
88

9-
$('[data-toggle="popover"]').popover();
9+
var popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'))
10+
var popoverList = popoverTriggerList.map(function (popoverTriggerEl) {
11+
return new bootstrap.Popover(popoverTriggerEl)
12+
})
1013

1114
// ------------------------------------------------------
1215
// @Tooltips
1316
// ------------------------------------------------------
1417

15-
$('[data-toggle="tooltip"]').tooltip();
18+
var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
19+
var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
20+
return new bootstrap.Tooltip(tooltipTriggerEl)
21+
})
1622
}());

‎src/assets/styles/spec/components/topbar.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@
9393
}
9494

9595
.dropdown-menu {
96-
display: block;
96+
// display: block;
9797
margin: 0;
9898
transform-origin: top right;
99-
transform: scale(0, 0);
99+
// transform: scale(0, 0);
100100
transition: transform 0.15s ease-out;
101101

102102
.divider {

‎src/assets/styles/spec/generic/base.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ html, html a, body {
44

55
a {
66
transition: all 0.3s ease-in-out;
7+
text-decoration: none;
78
}
89

910
body {
@@ -77,3 +78,20 @@ a {
7778
hr {
7879
border-top: 1px solid $border-color;
7980
}
81+
82+
83+
a.btn {
84+
color:#fff;
85+
}
86+
87+
a.btn:hover {
88+
color:#fff;
89+
}
90+
91+
.btn-color {
92+
color:#fff;
93+
}
94+
95+
.btn-color:hover {
96+
color:#fff;
97+
}

‎src/basic-table.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ <h5 class="lh-1 mB-0 logo-text">Adminator</h5>
312312
<ul class="nav-right">
313313
<li class="notifications dropdown">
314314
<span class="counter bgc-red">3</span>
315-
<a href="" class="dropdown-toggle no-after" data-toggle="dropdown">
315+
<a href="" class="dropdown-toggle no-after" data-bs-toggle="dropdown">
316316
<i class="ti-bell"></i>
317317
</a>
318318

@@ -385,7 +385,7 @@ <h5 class="lh-1 mB-0 logo-text">Adminator</h5>
385385
</li>
386386
<li class="notifications dropdown">
387387
<span class="counter bgc-blue">3</span>
388-
<a href="" class="dropdown-toggle no-after" data-toggle="dropdown">
388+
<a href="" class="dropdown-toggle no-after" data-bs-toggle="dropdown">
389389
<i class="ti-email"></i>
390390
</a>
391391

@@ -466,13 +466,13 @@ <h5 class="lh-1 mB-0 logo-text">Adminator</h5>
466466
</li>
467467
<li class="pX-20 pY-15 ta-c bdT">
468468
<span>
469-
<a href="email.html" class="c-grey-600 cH-blue fsz-sm td-n">View All Email <i class="fs-xs ti-angle-right mL-10"></i></a>
469+
<a href="email.html" class="c-grey-600 cH-blue fsz-sm td-n">View All Email <i class="fs-xs ti-angle-right ms-10"></i></a>
470470
</span>
471471
</li>
472472
</ul>
473473
</li>
474474
<li class="dropdown">
475-
<a href="" class="dropdown-toggle no-after peers fxw-nw ai-c lh-1" data-toggle="dropdown">
475+
<a href="" class="dropdown-toggle no-after peers fxw-nw ai-c lh-1" data-bs-toggle="dropdown">
476476
<div class="peer mR-10">
477477
<img class="w-2r bdrs-50p" src="https://randomuser.me/api/portraits/men/10.jpg" alt="">
478478
</div>
@@ -521,7 +521,7 @@ <h4 class="c-grey-900 mT-10 mB-30">Basic Tables</h4>
521521
<div class="col-md-12">
522522
<div class="bgc-white bd bdrs-3 p-20 mB-20">
523523
<h4 class="c-grey-900 mB-20">Simple Table</h4>
524-
<p>Using the most basic table markup, here’s how <code class="highlighter-rouge">.table</code>-based tables look in Bootstrap. <strong>All table styles are inherited in Bootstrap 4</strong>, meaning any nested tables will be styled in the same manner as the parent.</p>
524+
<p>Using the most basic table markup, here’s how <code class="highlighter-rouge">.table</code>-based tables look in Bootstrap. <strong>All table styles are inherited in Bootstrap 5</strong>, meaning any nested tables will be styled in the same manner as the parent.</p>
525525
<table class="table">
526526
<thead>
527527
<tr>
@@ -559,9 +559,9 @@ <h4 class="c-grey-900 mB-20">Simple Table</h4>
559559
<div class="col-md-12">
560560
<div class="bgc-white bd bdrs-3 p-20 mB-20">
561561
<h4 class="c-grey-900 mB-20">Table head options</h4>
562-
<p>Similar to tables and dark tables, use the modifier classes <code class="highlighter-rouge">.thead-light</code> or <code class="highlighter-rouge">.thead-dark</code> to make <code class="highlighter-rouge">&lt;thead&gt;</code>s appear light or dark gray.</p>
562+
<p>Similar to tables and dark tables, use the modifier classes <code class="highlighter-rouge">.table-light</code> or <code class="highlighter-rouge">.table-dark</code> to make <code class="highlighter-rouge">&lt;thead&gt;</code>s appear light or dark gray.</p>
563563
<table class="table">
564-
<thead class="thead-dark">
564+
<thead class="table-dark">
565565
<tr>
566566
<th scope="col">#</th>
567567
<th scope="col">First Name</th>
@@ -717,7 +717,7 @@ <h4 class="c-grey-900 mB-20">Hoverable rows</h4>
717717

718718
<!-- ### $App Screen Footer ### -->
719719
<footer class="bdT ta-c p-30 lh-0 fsz-sm c-grey-600">
720-
<span>Copyright © 2019 Designed by <a href="https://colorlib.com" target='_blank' title="Colorlib">Colorlib</a>. All rights reserved.</span>
720+
<span>Copyright © 2021 Designed by <a href="https://colorlib.com" target='_blank' title="Colorlib">Colorlib</a>. All rights reserved.</span>
721721
</footer>
722722
</div>
723723
</div>

‎src/blank.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ <h5 class="lh-1 mB-0 logo-text">Adminator</h5>
176176
<span class="title">Forms</span>
177177
</a>
178178
</li>
179-
<li class="nav-item dropdown">
179+
<li class="nav-item">
180180
<a class="sidebar-link" href="ui.html">
181181
<span class="icon-holder">
182182
<i class="c-pink-500 ti-palette"></i>
@@ -312,11 +312,11 @@ <h5 class="lh-1 mB-0 logo-text">Adminator</h5>
312312
<ul class="nav-right">
313313
<li class="notifications dropdown">
314314
<span class="counter bgc-red">3</span>
315-
<a href="" class="dropdown-toggle no-after" data-toggle="dropdown">
315+
<a href="" class="dropdown-toggle no-after" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-expanded="false">
316316
<i class="ti-bell"></i>
317317
</a>
318318

319-
<ul class="dropdown-menu">
319+
<ul class="dropdown-menu" aria-labelledby="dropdownMenuLink">
320320
<li class="pX-20 pY-15 bdB">
321321
<i class="ti-bell pR-10"></i>
322322
<span class="fsz-sm fw-600 c-grey-900">Notifications</span>
@@ -385,11 +385,11 @@ <h5 class="lh-1 mB-0 logo-text">Adminator</h5>
385385
</li>
386386
<li class="notifications dropdown">
387387
<span class="counter bgc-blue">3</span>
388-
<a href="" class="dropdown-toggle no-after" data-toggle="dropdown">
388+
<a href="" class="dropdown-toggle no-after" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-expanded="false">
389389
<i class="ti-email"></i>
390390
</a>
391391

392-
<ul class="dropdown-menu">
392+
<ul class="dropdown-menu" aria-labelledby="dropdownMenuLink">
393393
<li class="pX-20 pY-15 bdB">
394394
<i class="ti-email pR-10"></i>
395395
<span class="fsz-sm fw-600 c-grey-900">Emails</span>
@@ -472,15 +472,15 @@ <h5 class="lh-1 mB-0 logo-text">Adminator</h5>
472472
</ul>
473473
</li>
474474
<li class="dropdown">
475-
<a href="" class="dropdown-toggle no-after peers fxw-nw ai-c lh-1" data-toggle="dropdown">
475+
<a href="" class="dropdown-toggle no-after peers fxw-nw ai-c lh-1" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-expanded="false">
476476
<div class="peer mR-10">
477477
<img class="w-2r bdrs-50p" src="https://randomuser.me/api/portraits/men/10.jpg" alt="">
478478
</div>
479479
<div class="peer">
480480
<span class="fsz-sm c-grey-900">John Doe</span>
481481
</div>
482482
</a>
483-
<ul class="dropdown-menu fsz-sm">
483+
<ul class="dropdown-menu fsz-sm" aria-labelledby="dropdownMenuLink">
484484
<li>
485485
<a href="" class="d-b td-n pY-5 bgcH-grey-100 c-grey-700">
486486
<i class="ti-settings mR-10"></i>
@@ -524,7 +524,7 @@ <h5 class="lh-1 mB-0 logo-text">Adminator</h5>
524524

525525
<!-- ### $App Screen Footer ### -->
526526
<footer class="bdT ta-c p-30 lh-0 fsz-sm c-grey-600">
527-
<span>Copyright © 2019 Designed by <a href="https://colorlib.com" target='_blank' title="Colorlib">Colorlib</a>. All rights reserved.</span>
527+
<span>Copyright © 2021 Designed by <a href="https://colorlib.com" target='_blank' title="Colorlib">Colorlib</a>. All rights reserved.</span>
528528
</footer>
529529
</div>
530530
</div>

‎src/buttons.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ <h5 class="lh-1 mB-0 logo-text">Adminator</h5>
262262
<ul class="nav-right">
263263
<li class="notifications dropdown">
264264
<span class="counter bgc-red">3</span>
265-
<a href="" class="dropdown-toggle no-after" data-toggle="dropdown">
265+
<a href="" class="dropdown-toggle no-after" data-bs-toggle="dropdown">
266266
<i class="ti-bell"></i>
267267
</a>
268268

@@ -335,7 +335,7 @@ <h5 class="lh-1 mB-0 logo-text">Adminator</h5>
335335
</li>
336336
<li class="notifications dropdown">
337337
<span class="counter bgc-blue">3</span>
338-
<a href="" class="dropdown-toggle no-after" data-toggle="dropdown">
338+
<a href="" class="dropdown-toggle no-after" data-bs-toggle="dropdown">
339339
<i class="ti-email"></i>
340340
</a>
341341

@@ -422,8 +422,8 @@ <h5 class="lh-1 mB-0 logo-text">Adminator</h5>
422422
</ul>
423423
</li>
424424
<li class="dropdown">
425-
<a href="" class="dropdown-toggle no-after peers fxw-nw ai-c lh-1" data-toggle="dropdown">
426-
<div class="peer mR-10">
425+
<a href="" class="dropdown-toggle no-after peers fxw-nw ai-c lh-1" data-bs-toggle="dropdown">
426+
<div class="peer me-10">
427427
<img class="w-2r bdrs-50p" src="https://randomuser.me/api/portraits/men/10.jpg" alt="">
428428
</div>
429429
<div class="peer">
@@ -469,7 +469,7 @@ <h5 class="lh-1 mB-0 logo-text">Adminator</h5>
469469

470470
<!-- ### $App Screen Footer ### -->
471471
<footer class="bdT ta-c p-30 lh-0 fsz-sm c-grey-600">
472-
<span>Copyright © 2019 Designed by <a href="https://colorlib.com" target='_blank' title="Colorlib">Colorlib</a>. All rights reserved.</span>
472+
<span>Copyright © 2021 Designed by <a href="https://colorlib.com" target='_blank' title="Colorlib">Colorlib</a>. All rights reserved.</span>
473473
</footer>
474474
</div>
475475
</div>

0 commit comments

Comments
 (0)