Skip to content

Commit 5726642

Browse files
committed
Change logo;
Add separate lines in table; Fix btn border radius; Fix unlock button; Fix toggle sidebar; Fix header on mobile; Update dist folder
1 parent cbe7732 commit 5726642

File tree

111 files changed

+157
-97
lines changed

Some content is hidden

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

111 files changed

+157
-97
lines changed

.idea/codeStyles/codeStyleConfig.xml

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

changelog.md

Lines changed: 11 additions & 0 deletions

dist/css/application.min.css

Lines changed: 0 additions & 21 deletions
This file was deleted.

dist/css/maps/application.min.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/img/logo.svg

Lines changed: 0 additions & 8 deletions
This file was deleted.

dist/charts.html renamed to docs/charts.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</a>
5050
</li>
5151
</ul>
52-
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button">
52+
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button d-none d-md-block">
5353
<button class="btn btn-outline-warning rounded-0 width-175 mr-3 d-block d-md-none d-lg-block " role="button" >
5454
<span class="fw-semi-bold mr-1">Unlock Full Version </span><i class="fa fa-long-arrow-right" aria-hidden="true"></i>
5555
</button>

docs/css/application.min.css

Lines changed: 21 additions & 0 deletions
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 & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

dist/icons.html renamed to docs/icons.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</a>
5050
</li>
5151
</ul>
52-
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button">
52+
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button d-none d-md-block">
5353
<button class="btn btn-outline-warning rounded-0 width-175 mr-3 d-block d-md-none d-lg-block " role="button" >
5454
<span class="fw-semi-bold mr-1">Unlock Full Version </span><i class="fa fa-long-arrow-right" aria-hidden="true"></i>
5555
</button>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docs/img/logo.svg

Lines changed: 8 additions & 0 deletions
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

dist/index.html renamed to docs/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</a>
5050
</li>
5151
</ul>
52-
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button">
52+
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button d-none d-md-block">
5353
<button class="btn btn-outline-warning rounded-0 width-175 mr-3 d-block d-md-none d-lg-block " role="button" >
5454
<span class="fw-semi-bold mr-1">Unlock Full Version </span><i class="fa fa-long-arrow-right" aria-hidden="true"></i>
5555
</button>
@@ -761,7 +761,7 @@ <h5>
761761
</header>
762762
<div class="widget-body">
763763
<div class="table-responsive">
764-
<table class="mb-0 table table-borderless dashboard-table">
764+
<table class="mb-0 table dashboard-table">
765765
<thead>
766766
<tr>
767767
<th scope="col" class="pl-0">Invoices</th>

dist/js/app.js renamed to docs/js/app.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ $(function(){
397397
initAppPlugins();
398398
initAppFunctions();
399399
initAppFixes();
400+
initSidebarLogic();
400401
});
401402

402403
/**
@@ -553,7 +554,25 @@ function initAppFunctions(){
553554
}(jQuery);
554555

555556
}
557+
function initSidebarLogic(){
558+
!function($){
559+
560+
const mainSidebar = $('#sidebar');
561+
const toggleSidebar = $('#toggleSidebar');
562+
563+
$('.content-wrap').on('click', (e) => {
564+
if ($('.toggle-sidebar').hasClass('open')) {
565+
mainSidebar.removeClass('sidebar-open');
566+
$('.toggle-sidebar').removeClass('open');
567+
}
568+
});
556569

570+
toggleSidebar.on('click', (e) => {
571+
mainSidebar.toggleClass('sidebar-open');
572+
$('.toggle-sidebar').toggleClass('open');
573+
});
574+
}(jQuery);
575+
}
557576
/**
558577
* Sing browser fixes. It's always something broken somewhere
559578
*/
File renamed without changes.
File renamed without changes.

dist/js/dashboard/index.js renamed to docs/js/dashboard/index.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ $(function(){
136136
};
137137

138138
function apexChartThird() {
139-
var options = {
139+
let options = {
140140
series: [{
141141
data: [31, 40, 28, 51, 42, 25, 63]
142142
}],
@@ -191,7 +191,7 @@ $(function(){
191191
}
192192
};
193193

194-
var chart = new ApexCharts(document.querySelector("#third-apex-chard"), options);
194+
let chart = new ApexCharts(document.querySelector("#third-apex-chard"), options);
195195
chart.render();
196196
};
197197

@@ -250,7 +250,7 @@ $(function(){
250250
}
251251
};
252252

253-
var chart = new ApexCharts(document.querySelector("#fourth-apex-chart"), options);
253+
let chart = new ApexCharts(document.querySelector("#fourth-apex-chart"), options);
254254
chart.render();
255255
};
256256

@@ -327,12 +327,12 @@ $(function(){
327327
}
328328
};
329329

330-
var chart = new ApexCharts(document.querySelector("#fifth-apex-chart"), options);
330+
let chart = new ApexCharts(document.querySelector("#fifth-apex-chart"), options);
331331
chart.render();
332332
};
333333

334334
function apexChartSixth() {
335-
var options = {
335+
let options = {
336336
series: [1732, 253, 154],
337337
chart: {
338338
type: 'donut',
@@ -358,7 +358,7 @@ $(function(){
358358
}
359359
};
360360

361-
var chart = new ApexCharts(document.querySelector("#sixth-apex-chard"), options);
361+
let chart = new ApexCharts(document.querySelector("#sixth-apex-chard"), options);
362362
chart.render();
363363
};
364364

@@ -374,4 +374,4 @@ $(function(){
374374

375375
pageLoad();
376376
SingApp.onPageLoad(pageLoad);
377-
});
377+
});
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

dist/maps_google.html renamed to docs/maps_google.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</a>
5050
</li>
5151
</ul>
52-
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button">
52+
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button d-none d-md-block">
5353
<button class="btn btn-outline-warning rounded-0 width-175 mr-3 d-block d-md-none d-lg-block " role="button" >
5454
<span class="fw-semi-bold mr-1">Unlock Full Version </span><i class="fa fa-long-arrow-right" aria-hidden="true"></i>
5555
</button>

dist/notifications.html renamed to docs/notifications.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</a>
5050
</li>
5151
</ul>
52-
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button">
52+
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button d-none d-md-block">
5353
<button class="btn btn-outline-warning rounded-0 width-175 mr-3 d-block d-md-none d-lg-block " role="button" >
5454
<span class="fw-semi-bold mr-1">Unlock Full Version </span><i class="fa fa-long-arrow-right" aria-hidden="true"></i>
5555
</button>
File renamed without changes.

dist/tables.html renamed to docs/tables.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</a>
5050
</li>
5151
</ul>
52-
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button">
52+
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button d-none d-md-block">
5353
<button class="btn btn-outline-warning rounded-0 width-175 mr-3 d-block d-md-none d-lg-block " role="button" >
5454
<span class="fw-semi-bold mr-1">Unlock Full Version </span><i class="fa fa-long-arrow-right" aria-hidden="true"></i>
5555
</button>

dist/typography.html renamed to docs/typography.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</a>
5050
</li>
5151
</ul>
52-
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button">
52+
<a href="https://flatlogic.com/templates/one-bootstrap-template/demo" target="_blank" class="unlock-button d-none d-md-block">
5353
<button class="btn btn-outline-warning rounded-0 width-175 mr-3 d-block d-md-none d-lg-block " role="button" >
5454
<span class="fw-semi-bold mr-1">Unlock Full Version </span><i class="fa fa-long-arrow-right" aria-hidden="true"></i>
5555
</button>

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"name": "flatlogic_one_lite",
3-
"version": "1.1.2",
3+
"version": "1.1.3",
44
"description": "Flatlogic One Lite - Bootstrap 4 Admin Dashboard",
55
"scripts": {
66
"build": "gulp build",
77
"watch": "gulp watch"
88
},
99
"dependencies": {
1010
"animate.css": "^3.7.2",
11-
"apexcharts": "^3.21.0",
11+
"apexcharts": "^3.22.0",
1212
"autosize": "^4.0.2",
1313
"awesome-bootstrap-checkbox": "^1.0.1",
1414
"backbone": "^1.4.0",
1515
"backbone.paginator": "^2.0.8",
1616
"backgrid": "^0.3.8",
1717
"backgrid-paginator": "^0.3.9",
18-
"bootstrap": "^4.5.2",
18+
"bootstrap": "^4.5.3",
1919
"bootstrap-markdown": "^2.10.0",
2020
"components-jqueryui": "^1.12.1",
2121
"d3": "3.5.17",
@@ -32,17 +32,17 @@
3232
"gmaps": "^0.4.25",
3333
"hammerjs": "^2.0.8",
3434
"handlebars": "^4.7.6",
35-
"holderjs": "^2.9.7",
35+
"holderjs": "^2.5.0",
3636
"jasny-bootstrap": "^3.1.3",
37-
"jquery": "2.2.4",
37+
"jquery": "2.1.4",
3838
"jquery-autosize": "^1.18.18",
3939
"jquery-hammerjs": "^2.0.0",
4040
"jquery-mapael": "2.2.0",
4141
"jquery-mapael-0.7.1": "https://github.com/neveldo/jQuery-Mapael.git#v0.7.1",
4242
"jquery-nestable": "^0.8.0",
4343
"jquery-pjax": "^2.0.1",
4444
"jquery-slimscroll": "^1.3.8",
45-
"jquery-sparkline": "^2.4.0",
45+
"jquery-sparkline": "^2.3.2",
4646
"jquery-ui": "^1.12.1",
4747
"jquery-ui-touch-punch": "^0.2.3",
4848
"jquery.animate-number": "0.0.14",
@@ -53,14 +53,14 @@
5353
"metrojs": "^0.9.77",
5454
"minimatch": "^3.0.4",
5555
"morris.js": "^0.5.0",
56-
"node-sass": "^4.14.1",
56+
"node-sass": "^4.13.1",
5757
"nvd3": "^1.8.6",
5858
"owl.carousel": "^2.3.4",
59-
"parsleyjs": "^2.9.2",
60-
"popper.js": "^1.16.1",
59+
"parsleyjs": "^2.8.1",
60+
"popper.js": "^1.14.3",
6161
"raphael": "^2.3.0",
62-
"rickshaw": "^1.7.1",
63-
"select2": "4.0.13",
62+
"rickshaw": "^1.6.6",
63+
"select2": "4.0.5",
6464
"select2-bootstrap-css": "^1.4.6",
6565
"tempusdominus-bootstrap-4": "^5.1.2",
6666
"turndown": "^5.0.3",

src/img/logo.svg

Lines changed: 5 additions & 5 deletions

src/js/app.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ $(function(){
397397
initAppPlugins();
398398
initAppFunctions();
399399
initAppFixes();
400+
initSidebarLogic();
400401
});
401402

402403
/**
@@ -553,7 +554,25 @@ function initAppFunctions(){
553554
}(jQuery);
554555

555556
}
557+
function initSidebarLogic(){
558+
!function($){
559+
560+
const mainSidebar = $('#sidebar');
561+
const toggleSidebar = $('#toggleSidebar');
562+
563+
$('.content-wrap').on('click', (e) => {
564+
if ($('.toggle-sidebar').hasClass('open')) {
565+
mainSidebar.removeClass('sidebar-open');
566+
$('.toggle-sidebar').removeClass('open');
567+
}
568+
});
556569

570+
toggleSidebar.on('click', (e) => {
571+
mainSidebar.toggleClass('sidebar-open');
572+
$('.toggle-sidebar').toggleClass('open');
573+
});
574+
}(jQuery);
575+
}
557576
/**
558577
* Sing browser fixes. It's always something broken somewhere
559578
*/

src/js/dashboard/index.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ $(function(){
136136
};
137137

138138
function apexChartThird() {
139-
var options = {
139+
let options = {
140140
series: [{
141141
data: [31, 40, 28, 51, 42, 25, 63]
142142
}],
@@ -191,7 +191,7 @@ $(function(){
191191
}
192192
};
193193

194-
var chart = new ApexCharts(document.querySelector("#third-apex-chard"), options);
194+
let chart = new ApexCharts(document.querySelector("#third-apex-chard"), options);
195195
chart.render();
196196
};
197197

@@ -250,7 +250,7 @@ $(function(){
250250
}
251251
};
252252

253-
var chart = new ApexCharts(document.querySelector("#fourth-apex-chart"), options);
253+
let chart = new ApexCharts(document.querySelector("#fourth-apex-chart"), options);
254254
chart.render();
255255
};
256256

@@ -327,12 +327,12 @@ $(function(){
327327
}
328328
};
329329

330-
var chart = new ApexCharts(document.querySelector("#fifth-apex-chart"), options);
330+
let chart = new ApexCharts(document.querySelector("#fifth-apex-chart"), options);
331331
chart.render();
332332
};
333333

334334
function apexChartSixth() {
335-
var options = {
335+
let options = {
336336
series: [1732, 253, 154],
337337
chart: {
338338
type: 'donut',
@@ -358,7 +358,7 @@ $(function(){
358358
}
359359
};
360360

361-
var chart = new ApexCharts(document.querySelector("#sixth-apex-chard"), options);
361+
let chart = new ApexCharts(document.querySelector("#sixth-apex-chard"), options);
362362
chart.render();
363363
};
364364

@@ -374,4 +374,4 @@ $(function(){
374374

375375
pageLoad();
376376
SingApp.onPageLoad(pageLoad);
377-
});
377+
});

src/pages/index.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@
408408
</header>
409409
<div class="widget-body">
410410
<div class="table-responsive">
411-
<table class="mb-0 table table-borderless dashboard-table">
411+
<table class="mb-0 table dashboard-table">
412412
<thead>
413413
<tr>
414414
<th scope="col" class="pl-0">Invoices</th>
@@ -485,4 +485,4 @@
485485
<!-- page specific js -->
486486
<script src="js/dashboard/index.js"></script>
487487
{{/content}}
488-
{{/extend}}
488+
{{/extend}}

0 commit comments

Comments
 (0)