Skip to content

Commit 43bc558

Browse files
BlariBlari
committed
- Fix buttons, badges;
- Fix breadcrumbs; - Fix success button in notification; - Fix dropdown adaptive on header; - Update demo
1 parent 5726642 commit 43bc558

18 files changed

+136
-115
lines changed

‎changelog.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
# Changelog
2+
## [1.1.4]
3+
4+
### Fixed
5+
6+
- Fix buttons, badges;
7+
- Fix breadcrumbs;
8+
- Fix success button in notification;
9+
- Fix dropdown adaptive on header;
10+
211
## [1.1.3]
312

413
### Updated

‎docs/charts.html

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,9 @@
8383
<p class="dropdown-date">Today</p>
8484
<li role="presentation">
8585
<a role="menuitem" target="_self" href="#" class="dropdown-item">
86-
8786
<span class="avatar thumb-sm mr-3">
8887
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
8988
</span>
90-
9189
<div>
9290
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
9391
</div>
@@ -112,11 +110,9 @@
112110
<p class="dropdown-date">Yesterday</p>
113111
<li role="presentation">
114112
<a role="menuitem" target="_self" href="#" class="dropdown-item">
115-
116113
<span class="avatar thumb-sm mr-3">
117114
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
118115
</span>
119-
120116
<div>
121117
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
122118
</div>
@@ -361,7 +357,7 @@ <h5 class="sidebar-nav-title">Template </h5>
361357
<li class="breadcrumb-item active">Charts</li>
362358
</ol>
363359
<div class="row">
364-
<div class="col-lg-6 col-xl-5">
360+
<div class="col-xl-5">
365361
<section class="widget">
366362
<header>
367363
<h5>
@@ -432,7 +428,7 @@ <h6 class="name text-muted no-margin fs-mini">Overall Values</h6>
432428
</div>
433429
</section>
434430
</div>
435-
<div class="col-lg-6 col-xl-7">
431+
<div class="col-xl-7">
436432
<div class="row">
437433
<div class="col-lg-7">
438434
<section class="widget">
@@ -696,7 +692,7 @@ <h5>
696692
</div>
697693
</div>
698694
<div class="row">
699-
<div class="col-lg-2 col-xl-3">
695+
<div class="col-lg-6 col-xl-3">
700696
<section class="widget">
701697
<header>
702698
<h5>
@@ -740,7 +736,7 @@ <h6 class="name">Montly</h6>
740736
</div>
741737
</section>
742738
</div>
743-
<div class="col-lg-5 col-xl-6">
739+
<div class="col-lg-6 col-xl-6">
744740
<section class="widget">
745741
<header>
746742
<h5>
@@ -774,7 +770,7 @@ <h5>
774770
</div>
775771
</section>
776772
</div>
777-
<div class="col-lg-5 col-xl-3">
773+
<div class="col-lg-12 col-xl-3">
778774
<section class="widget">
779775
<header>
780776
<h5>

‎docs/css/application.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/css/maps/application.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/icons.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,9 @@
8383
<p class="dropdown-date">Today</p>
8484
<li role="presentation">
8585
<a role="menuitem" target="_self" href="#" class="dropdown-item">
86-
8786
<span class="avatar thumb-sm mr-3">
8887
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
8988
</span>
90-
9189
<div>
9290
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
9391
</div>
@@ -112,11 +110,9 @@
112110
<p class="dropdown-date">Yesterday</p>
113111
<li role="presentation">
114112
<a role="menuitem" target="_self" href="#" class="dropdown-item">
115-
116113
<span class="avatar thumb-sm mr-3">
117114
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
118115
</span>
119-
120116
<div>
121117
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
122118
</div>

‎docs/index.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,9 @@
8383
<p class="dropdown-date">Today</p>
8484
<li role="presentation">
8585
<a role="menuitem" target="_self" href="#" class="dropdown-item">
86-
8786
<span class="avatar thumb-sm mr-3">
8887
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
8988
</span>
90-
9189
<div>
9290
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
9391
</div>
@@ -112,11 +110,9 @@
112110
<p class="dropdown-date">Yesterday</p>
113111
<li role="presentation">
114112
<a role="menuitem" target="_self" href="#" class="dropdown-item">
115-
116113
<span class="avatar thumb-sm mr-3">
117114
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
118115
</span>
119-
120116
<div>
121117
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
122118
</div>

‎docs/maps_google.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,9 @@
8383
<p class="dropdown-date">Today</p>
8484
<li role="presentation">
8585
<a role="menuitem" target="_self" href="#" class="dropdown-item">
86-
8786
<span class="avatar thumb-sm mr-3">
8887
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
8988
</span>
90-
9189
<div>
9290
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
9391
</div>
@@ -112,11 +110,9 @@
112110
<p class="dropdown-date">Yesterday</p>
113111
<li role="presentation">
114112
<a role="menuitem" target="_self" href="#" class="dropdown-item">
115-
116113
<span class="avatar thumb-sm mr-3">
117114
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
118115
</span>
119-
120116
<div>
121117
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
122118
</div>

‎docs/notifications.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,9 @@
8383
<p class="dropdown-date">Today</p>
8484
<li role="presentation">
8585
<a role="menuitem" target="_self" href="#" class="dropdown-item">
86-
8786
<span class="avatar thumb-sm mr-3">
8887
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
8988
</span>
90-
9189
<div>
9290
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
9391
</div>
@@ -112,11 +110,9 @@
112110
<p class="dropdown-date">Yesterday</p>
113111
<li role="presentation">
114112
<a role="menuitem" target="_self" href="#" class="dropdown-item">
115-
116113
<span class="avatar thumb-sm mr-3">
117114
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
118115
</span>
119-
120116
<div>
121117
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
122118
</div>
@@ -357,6 +353,7 @@ <h5 class="sidebar-nav-title">Template </h5>
357353
<main id="content" class="content" role="main">
358354
<!-- Page content -->
359355
<ol class="breadcrumb">
356+
<li class="breadcrumb-item">UI</li>
360357
<li class="breadcrumb-item active">Notifications</li>
361358
</ol>
362359
<section class="widget">

‎docs/tables.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,9 @@
8383
<p class="dropdown-date">Today</p>
8484
<li role="presentation">
8585
<a role="menuitem" target="_self" href="#" class="dropdown-item">
86-
8786
<span class="avatar thumb-sm mr-3">
8887
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
8988
</span>
90-
9189
<div>
9290
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
9391
</div>
@@ -112,11 +110,9 @@
112110
<p class="dropdown-date">Yesterday</p>
113111
<li role="presentation">
114112
<a role="menuitem" target="_self" href="#" class="dropdown-item">
115-
116113
<span class="avatar thumb-sm mr-3">
117114
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
118115
</span>
119-
120116
<div>
121117
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
122118
</div>
@@ -580,7 +576,7 @@ <h5>
580576
</div>
581577
<div class="clearfix">
582578
<div class="float-right">
583-
<button class="btn btn-warning text-uppercase">
579+
<button class="btn btn-warning text-uppercase mr-3">
584580
Send to ...
585581
</button>
586582
<div class="btn-group">
@@ -663,7 +659,7 @@ <h3>Stripped <span class="fw-semi-bold">Table</span></h3>
663659
<label for="checkbox3"></label>
664660
</div>
665661
</td>
666-
<td>Jacob <span class="badge bg-warning text-gray-dark">ALERT!</span></td>
662+
<td>Jacob <span class="badge bg-warning">ALERT!</span></td>
667663
<td>Thornton</td>
668664
<td><span class="badge bg-gray">Away</span></td>
669665
</tr>

‎docs/typography.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,9 @@
8383
<p class="dropdown-date">Today</p>
8484
<li role="presentation">
8585
<a role="menuitem" target="_self" href="#" class="dropdown-item">
86-
8786
<span class="avatar thumb-sm mr-3">
8887
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
8988
</span>
90-
9189
<div>
9290
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
9391
</div>
@@ -112,11 +110,9 @@
112110
<p class="dropdown-date">Yesterday</p>
113111
<li role="presentation">
114112
<a role="menuitem" target="_self" href="#" class="dropdown-item">
115-
116113
<span class="avatar thumb-sm mr-3">
117114
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
118115
</span>
119-
120116
<div>
121117
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
122118
</div>

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "flatlogic_one_lite",
3-
"version": "1.1.3",
4-
"description": "Flatlogic One Lite - Bootstrap 4 Admin Dashboard",
3+
"version": "1.1.4",
4+
"description": "Flatlogic One Lite - Bootstrap 4.5 Admin Dashboard",
55
"scripts": {
66
"build": "gulp build",
77
"watch": "gulp watch"
88
},
99
"dependencies": {
1010
"animate.css": "^3.7.2",
11-
"apexcharts": "^3.22.0",
11+
"apexcharts": "^3.22.2",
1212
"autosize": "^4.0.2",
1313
"awesome-bootstrap-checkbox": "^1.0.1",
1414
"backbone": "^1.4.0",

‎src/pages/charts.hbs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<li class="breadcrumb-item active">Charts</li>
99
</ol>
1010
<div class="row">
11-
<div class="col-lg-6 col-xl-5">
11+
<div class="col-xl-5">
1212
<section class="widget">
1313
<header>
1414
<h5>
@@ -79,7 +79,7 @@
7979
</div>
8080
</section>
8181
</div>
82-
<div class="col-lg-6 col-xl-7">
82+
<div class="col-xl-7">
8383
<div class="row">
8484
<div class="col-lg-7">
8585
<section class="widget">
@@ -343,7 +343,7 @@
343343
</div>
344344
</div>
345345
<div class="row">
346-
<div class="col-lg-2 col-xl-3">
346+
<div class="col-lg-6 col-xl-3">
347347
<section class="widget">
348348
<header>
349349
<h5>
@@ -387,7 +387,7 @@
387387
</div>
388388
</section>
389389
</div>
390-
<div class="col-lg-5 col-xl-6">
390+
<div class="col-lg-6 col-xl-6">
391391
<section class="widget">
392392
<header>
393393
<h5>
@@ -421,7 +421,7 @@
421421
</div>
422422
</section>
423423
</div>
424-
<div class="col-lg-5 col-xl-3">
424+
<div class="col-lg-12 col-xl-3">
425425
<section class="widget">
426426
<header>
427427
<h5>
@@ -482,4 +482,4 @@
482482
<!-- page specific js -->
483483
<script src="js/charts/charts.js"></script>
484484
{{/content}}
485-
{{/extend}}
485+
{{/extend}}

‎src/pages/notifications.hbs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{{/content}}
55
{{#content "content" mode="replace"}}
66
<ol class="breadcrumb">
7+
<li class="breadcrumb-item">UI</li>
78
<li class="breadcrumb-item active">Notifications</li>
89
</ol>
910
<section class="widget">
@@ -76,4 +77,4 @@
7677
<!-- page specific js -->
7778
<script src="js/components/ui-notifications.js"></script>
7879
{{/content}}
79-
{{/extend}}
80+
{{/extend}}

‎src/pages/tables.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
</div>
228228
<div class="clearfix">
229229
<div class="float-right">
230-
<button class="btn btn-warning text-uppercase">
230+
<button class="btn btn-warning text-uppercase mr-3">
231231
Send to ...
232232
</button>
233233
<div class="btn-group">
@@ -310,7 +310,7 @@
310310
<label for="checkbox3"></label>
311311
</div>
312312
</td>
313-
<td>Jacob <span class="badge bg-warning text-gray-dark">ALERT!</span></td>
313+
<td>Jacob <span class="badge bg-warning">ALERT!</span></td>
314314
<td>Thornton</td>
315315
<td><span class="badge bg-gray">Away</span></td>
316316
</tr>
@@ -623,4 +623,4 @@
623623
<!-- page specific js -->
624624
<script src="js/tables/tables-basic.js"></script>
625625
{{/content}}
626-
{{/extend}}
626+
{{/extend}}

‎src/partials/navbar.hbs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,9 @@
4444
<p class="dropdown-date">Today</p>
4545
<li role="presentation">
4646
<a role="menuitem" target="_self" href="#" class="dropdown-item">
47-
4847
<span class="avatar thumb-sm mr-3">
4948
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
5049
</span>
51-
5250
<div>
5351
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
5452
</div>
@@ -73,11 +71,9 @@
7371
<p class="dropdown-date">Yesterday</p>
7472
<li role="presentation">
7573
<a role="menuitem" target="_self" href="#" class="dropdown-item">
76-
7774
<span class="avatar thumb-sm mr-3">
7875
<img src="img/avatars/tn1.png" alt="..." class="rounded-circle pt-1">
7976
</span>
80-
8177
<div>
8278
<span> <span class="fw-bold">Jim Tomson </span> removed you to the project <span class="fw-bold"> Flatlogic One</span> </span>
8379
</div>

0 commit comments

Comments
 (0)