Skip to content

Commit

Permalink
Merge pull request #33 from themesberg/v1.3.1
Browse files Browse the repository at this point in the history
Update to V1.3.1
  • Loading branch information
zoltanszogyenyi authored Feb 2, 2021
2 parents 9351f6d + 5b9f64b commit 3eec9e9
Show file tree
Hide file tree
Showing 15 changed files with 1,348 additions and 2,815 deletions.
8 changes: 4 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const paths = {

// Compile SCSS
gulp.task('scss', function () {
return gulp.src([paths.src.scss + '/volt/**/*.scss', paths.src.scss + '/volt.scss'])
return gulp.src([paths.src.scss + '/custom/**/*.scss', paths.src.scss + '/volt/**/*.scss', paths.src.scss + '/volt.scss'])
.pipe(wait(500))
.pipe(sourcemaps.init())
.pipe(sass().on('error', sass.logError))
Expand Down Expand Up @@ -127,7 +127,7 @@ gulp.task('serve', gulp.series('scss', 'html', 'index', 'assets', 'vendor', func
server: paths.temp.base
});

gulp.watch([paths.src.scss + '/volt/**/*.scss', paths.src.scss + '/volt.scss'], gulp.series('scss'));
gulp.watch([paths.src.scss + '/volt/**/*.scss', paths.src.scss + '/custom/**/*.scss', paths.src.scss + '/volt.scss'], gulp.series('scss'));
gulp.watch([paths.src.html, paths.src.base + '*.html', paths.src.partials], gulp.series('html', 'index'));
gulp.watch([paths.src.assets], gulp.series('assets'));
gulp.watch([paths.src.vendor], gulp.series('vendor'));
Expand Down Expand Up @@ -193,7 +193,7 @@ gulp.task('clean:dev', function () {

// Compile and copy scss/css
gulp.task('copy:dist:css', function () {
return gulp.src([paths.src.scss + '/volt/**/*.scss', paths.src.scss + '/volt.scss'])
return gulp.src([paths.src.scss + '/volt/**/*.scss', paths.src.scss + '/custom/**/*.scss', paths.src.scss + '/volt.scss'])
.pipe(wait(500))
.pipe(sourcemaps.init())
.pipe(sass().on('error', sass.logError))
Expand All @@ -205,7 +205,7 @@ gulp.task('copy:dist:css', function () {
});

gulp.task('copy:dev:css', function () {
return gulp.src([paths.src.scss + '/volt/**/*.scss', paths.src.scss + '/volt.scss'])
return gulp.src([paths.src.scss + '/volt/**/*.scss', paths.src.scss + '/custom/**/*.scss', paths.src.scss + '/volt.scss'])
.pipe(wait(500))
.pipe(sourcemaps.init())
.pipe(sass().on('error', sass.logError))
Expand Down
34 changes: 17 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@themesberg/volt-bootstrap-5-dashboard",
"version": "1.3.0",
"version": "1.3.1",
"description": "Volt - Bootstrap 5 Dashboard",
"main": "gulpfile.js",
"author": "Themesberg",
Expand Down Expand Up @@ -61,4 +61,4 @@
"vanillajs-datepicker": "^1.0.3",
"waypoints": "4.0.1"
}
}
}
2 changes: 1 addition & 1 deletion src/pages/transactions.html
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ <h2 class="h4">All Orders</h2>
</li>
</ul>
</nav>
<div class="fw-bold small">Showing <b>5</b> out of <b>25</b> entries</div>
<div class="fw-bold small d-none d-lg-block">Showing <b>5</b> out of <b>25</b> entries</div>
</div>
</div>
@@include('./dashboard/_footer.html', {
Expand Down
1 change: 1 addition & 0 deletions src/scss/custom/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// $primary: blue;
59 changes: 49 additions & 10 deletions src/scss/volt.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
=========================================================
* Volt Free - Bootstrap 5 Dashboard
* Volt - Free Bootstrap 5 Dashboard
=========================================================
* Product Page: https://themesberg.com/product/admin-dashboard/volt-premium-bootstrap-5-dashboard
Expand All @@ -17,25 +17,64 @@

@import url('https://fonts.googleapis.com/css?family=Nunito+Sans:300,400,600,700&display=swap');

// Bootstrap mixins and functions
@import "../../node_modules/bootstrap/scss/mixins";
@import "../../node_modules/bootstrap/scss/functions";
// update variables here
@import "custom/variables";

// Change variables here
@import "../../node_modules/bootstrap/scss/functions";
@import "volt/variables";

// Third party
@import '../../node_modules/vanillajs-datepicker/sass/datepicker.scss';
@import "../../node_modules/chartist/dist/scss/chartist.scss";

// Bootstrap
@import "../../node_modules/bootstrap/scss/bootstrap";
@import "../../node_modules/bootstrap/scss/variables";
@import "../../node_modules/bootstrap/scss/mixins";
@import "../../node_modules/bootstrap/scss/utilities";

// Bootstrap Layout & components
@import "../../node_modules/bootstrap/scss/root";
@import "../../node_modules/bootstrap/scss/reboot";
@import "../../node_modules/bootstrap/scss/type";
@import "../../node_modules/bootstrap/scss/images";
@import "../../node_modules/bootstrap/scss/containers";
@import "../../node_modules/bootstrap/scss/grid";
@import "../../node_modules/bootstrap/scss/tables";
@import "../../node_modules/bootstrap/scss/forms";
@import "../../node_modules/bootstrap/scss/buttons";
@import "../../node_modules/bootstrap/scss/transitions";
@import "../../node_modules/bootstrap/scss/dropdown";
@import "../../node_modules/bootstrap/scss/button-group";
@import "../../node_modules/bootstrap/scss/nav";
@import "../../node_modules/bootstrap/scss/navbar";
@import "../../node_modules/bootstrap/scss/card";
@import "../../node_modules/bootstrap/scss/accordion";
@import "../../node_modules/bootstrap/scss/breadcrumb";
@import "../../node_modules/bootstrap/scss/pagination";
@import "../../node_modules/bootstrap/scss/badge";
@import "../../node_modules/bootstrap/scss/alert";
@import "../../node_modules/bootstrap/scss/progress";
@import "../../node_modules/bootstrap/scss/list-group";
@import "../../node_modules/bootstrap/scss/close";
@import "../../node_modules/bootstrap/scss/toasts";
@import "../../node_modules/bootstrap/scss/modal";
@import "../../node_modules/bootstrap/scss/tooltip";
@import "../../node_modules/bootstrap/scss/popover";
@import "../../node_modules/bootstrap/scss/carousel";
@import "../../node_modules/bootstrap/scss/spinners";

// Helpers
@import "../../node_modules/bootstrap/scss/helpers";

// Vendor
@import "volt/vendor";
// Utilities
@import "../../node_modules/bootstrap/scss/utilities/api";
// scss-docs-end import-stack

// volt mixins & functions
@import "volt/mixins";
@import "volt/functions";

// Utilities
@import "volt/reboot";
@import "volt/utilities";

// Layout
Expand All @@ -44,4 +83,4 @@
// Components
@import "volt/components";

// write your custom styles here!
// write your custom styles here!
1 change: 1 addition & 0 deletions src/scss/volt/_components.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import "components/body";
@import "components/accordions";
@import "components/alerts";
@import "components/avatars";
Expand Down
Loading

0 comments on commit 3eec9e9

Please sign in to comment.