diff --git a/gulpfile.js b/gulpfile.js index e4c10cd11..be3b8dfeb 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -147,7 +147,7 @@ gulp.task('clean-jekyll', (cb) => { */ gulp.task('sass', () => { const g = gulp - .src(`${srcDir}/scss/!(_)*.scss`) + .src(argv.withPlugins || BUILD ? `${srcDir}/scss/!(_)*.scss` : `${srcDir}/scss/+(tabler|demo).scss`) .pipe(debug()) .pipe(sass({ style: 'expanded', diff --git a/package.json b/package.json index 9c469863f..9f0bb1979 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "description": "Premium and Open Source dashboard template with responsive and high quality UI.", "scripts": { "start": "gulp start", + "start-plugins": "gulp start --with-plugins", "build": "gulp build", "preview": "gulp build --preview", "svg-optimize": "svgo -f svg/brand --pretty", diff --git a/src/pages/_includes/layout/header-actions/buttons.html b/src/pages/_includes/layout/header-actions/buttons.html index 15d3f50d1..d44a5dd0a 100644 --- a/src/pages/_includes/layout/header-actions/buttons.html +++ b/src/pages/_includes/layout/header-actions/buttons.html @@ -1,6 +1,10 @@
+ {% if page.layout-navbar-overlap and page.layout-navbar-dark %} + {% include ui/button.html text="New view" color="dark" %} + {% else %} {% include ui/button.html text="New view" color="white" %} + {% endif %} {% include ui/button.html icon="plus" text="Create new report" color="primary" class="d-none d-sm-inline-block" modal-id="report" %} {% include ui/button.html icon="plus" icon-only=true color="primary" class="d-sm-none" text="Create new report" modal-id="report" %} diff --git a/src/pages/_includes/layout/navbar-side.html b/src/pages/_includes/layout/navbar-side.html index b3380c2ca..e3457ca9f 100644 --- a/src/pages/_includes/layout/navbar-side.html +++ b/src/pages/_includes/layout/navbar-side.html @@ -3,23 +3,29 @@
{% unless include.condensed %} -
+
- {% include ui/button.html icon="brand-github" outline=true text="Source code" href=site.github-url external=true %} - {% include ui/button.html icon="heart" icon-color="pink" outline=true text="Sponsor" href=site.github-sponsors-url external=true %} + {% if include.dark %} + {% include ui/button.html color="dark" icon="brand-github" outline=true text="Source code" href=site.github-url external=true %} + {% include ui/button.html color="dark" icon="heart" icon-color="pink" outline=true text="Sponsor" href=site.github-sponsors-url external=true %} + {% else %} + {% include ui/button.html icon="brand-github" outline=true text="Source code" href=site.github-url external=true %} + {% include ui/button.html icon="heart" icon-color="pink" outline=true text="Sponsor" href=site.github-sponsors-url external=true %} + {% endif %}
{% endunless %} - - {% include ui/icon.html icon="moon" %} - +
+ + {% include ui/icon.html icon="moon" %} + - - {% include ui/icon.html icon="sun" %} - + + {% include ui/icon.html icon="sun" %} + -
+
{% include ui/icon.html icon="bell" %} diff --git a/src/pages/_includes/layout/navbar.html b/src/pages/_includes/layout/navbar.html index 5edfa15de..4e2344a0d 100644 --- a/src/pages/_includes/layout/navbar.html +++ b/src/pages/_includes/layout/navbar.html @@ -13,7 +13,7 @@ {% include layout/navbar-logo.html dark=include.dark small-logo=include.small-logo hide-logo=include.hide-logo class="d-none-navbar-horizontal pe-0 pe-md-3" breakpoint=breakpoint show-title=include.show-title header=true %} {% endunless %} - {% include layout/navbar-side.html class="order-md-last" hide-username=include.hide-username condensed=condensed person-id=include.person-id %} + {% include layout/navbar-side.html class="order-md-last" hide-username=include.hide-username condensed=condensed person-id=include.person-id dark=include.dark breakpoint=breakpoint %} {% if condensed %}