diff --git a/package-lock.json b/package-lock.json index 8962c3023..08061548d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@coreui/coreui-free-bootstrap-admin-template", - "version": "4.0.0-alpha.0", + "version": "4.0.0-alpha.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@coreui/coreui-free-bootstrap-admin-template", - "version": "4.0.0-alpha.0", + "version": "4.0.0-alpha.1", "license": "MIT", "dependencies": { "@coreui/chartjs": "^2.0.0", diff --git a/package.json b/package.json index b7f3eb1b1..ed4989818 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/coreui-free-bootstrap-admin-template", - "version": "4.0.0-alpha.0", + "version": "4.0.0-alpha.1", "description": "Free Bootstrap Admin Template", "keywords": [ "admin", @@ -61,7 +61,7 @@ "localhost": "browser-sync start --server \"./dist\" --serveStatic \"./\" --files \"./dist/\"", "pug": "npm-run-all --parallel pug-*", "pug-dist": "node build/pug.js --src src/pug/views/ --dest dist/", - "pug-src": "node build/pug.js --src src/pug/views/ --dest src/", + "pug-src": "node build/pug.js --src src/pug/views/ --dest src/views/", "release-version": "node build/change-version.js", "serve": "npm-run-all --sequential build-clean css js copy --parallel localhost watch", "serve-dist": "serve dist", diff --git a/src/js/charts.js b/src/js/charts.js index 92491b016..6c40513be 100644 --- a/src/js/charts.js +++ b/src/js/charts.js @@ -3,7 +3,7 @@ /** * -------------------------------------------------------------------------- - * CoreUI Boostrap Admin Template (v4.0.0-alpha.0): main.js + * CoreUI Boostrap Admin Template (v4.0.0-alpha.1): main.js * Licensed under MIT (https://coreui.io/license) * -------------------------------------------------------------------------- */ diff --git a/src/js/colors.js b/src/js/colors.js index e512b7f3c..9b389bfa7 100644 --- a/src/js/colors.js +++ b/src/js/colors.js @@ -2,7 +2,7 @@ /** * -------------------------------------------------------------------------- - * CoreUI Boostrap Admin Template (v4.0.0-alpha.0): colors.js + * CoreUI Boostrap Admin Template (v4.0.0-alpha.1): colors.js * Licensed under MIT (https://coreui.io/license) * -------------------------------------------------------------------------- */ diff --git a/src/js/main.js b/src/js/main.js index f50cc3846..898bd9221 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -3,7 +3,7 @@ /** * -------------------------------------------------------------------------- - * CoreUI Boostrap Admin Template (v4.0.0-alpha.0): main.js + * CoreUI Boostrap Admin Template (v4.0.0-alpha.1): main.js * Licensed under MIT (https://coreui.io/license) * -------------------------------------------------------------------------- */ diff --git a/src/js/popovers.js b/src/js/popovers.js index 16263d0c4..da5771b28 100644 --- a/src/js/popovers.js +++ b/src/js/popovers.js @@ -2,7 +2,7 @@ /** * -------------------------------------------------------------------------- - * CoreUI Free Boostrap Admin Template (v4.0.0-alpha.0): popovers.js + * CoreUI Free Boostrap Admin Template (v4.0.0-alpha.1): popovers.js * Licensed under MIT (https://coreui.io/license) * -------------------------------------------------------------------------- */ diff --git a/src/js/tooltips.js b/src/js/tooltips.js index 0be760227..1fd0700c6 100644 --- a/src/js/tooltips.js +++ b/src/js/tooltips.js @@ -2,7 +2,7 @@ /** * -------------------------------------------------------------------------- - * CoreUI Free Boostrap Admin Template (v4.0.0-alpha.0): tooltips.js + * CoreUI Free Boostrap Admin Template (v4.0.0-alpha.1): tooltips.js * Licensed under MIT (https://coreui.io/license) * -------------------------------------------------------------------------- */ diff --git a/src/js/widgets.js b/src/js/widgets.js index 6931a9885..d5086118e 100644 --- a/src/js/widgets.js +++ b/src/js/widgets.js @@ -2,7 +2,7 @@ /** * -------------------------------------------------------------------------- - * CoreUI Boostrap Admin Template (v4.0.0-alpha.0): main.js + * CoreUI Boostrap Admin Template (v4.0.0-alpha.1): main.js * Licensed under MIT (https://coreui.io/license) * -------------------------------------------------------------------------- */ diff --git a/src/pug/_layout/default.pug b/src/pug/_layout/default.pug index d766af867..5aaeffafa 100644 --- a/src/pug/_layout/default.pug +++ b/src/pug/_layout/default.pug @@ -7,9 +7,9 @@ html(lang='en') base(href=base) include ../_partials/head.pug block styles - body.bg-light + body include ../_partials/sidebar.pug - .wrapper.d-flex.flex-column.min-vh-100 + .wrapper.d-flex.flex-column.min-vh-100.bg-light include ../_partials/header.pug .body.flex-grow-1.px-3 .container-lg diff --git a/src/pug/_layout/pages.pug b/src/pug/_layout/pages.pug index 8ab16e681..7fba512ec 100644 --- a/src/pug/_layout/pages.pug +++ b/src/pug/_layout/pages.pug @@ -8,7 +8,8 @@ html(lang='en') base(href=base) include ../_partials/head.pug block styles - body.bg-light.min-vh-100.d-flex.flex-row.align-items-center - block view + body + .bg-light.min-vh-100.d-flex.flex-row.align-items-center + block view include ../_partials/scripts.pug diff --git a/src/pug/_partials/banner.pug b/src/pug/_partials/banner.pug index b674ec69f..0b5615d11 100644 --- a/src/pug/_partials/banner.pug +++ b/src/pug/_partials/banner.pug @@ -1,7 +1,7 @@ // * CoreUI - Free Bootstrap Admin Template - * @version v4.0.0-alpha.0 + * @version v4.0.0-alpha.1 * @link https://coreui.io - * Copyright (c) 2020 creativeLabs Łukasz Holeczek + * Copyright (c) 2021 creativeLabs Łukasz Holeczek * Licensed under MIT (https://coreui.io/license) = "\n" diff --git a/src/pug/_partials/footer.pug b/src/pug/_partials/footer.pug index da2509d1e..1bf1c0376 100644 --- a/src/pug/_partials/footer.pug +++ b/src/pug/_partials/footer.pug @@ -1,7 +1,7 @@ footer.footer div a(href='https://coreui.io') CoreUI - | © 2020 creativeLabs. + | © 2021 creativeLabs. div.ms-auto | Powered by  a(href='https://coreui.io/') CoreUI diff --git a/src/pug/views/base/forms.pug b/src/pug/views/base/forms.pug index 92f5bebdb..b3a332d97 100644 --- a/src/pug/views/base/forms.pug +++ b/src/pug/views/base/forms.pug @@ -44,7 +44,7 @@ block view option 2017 option 2018 option 2019 - option 2020 + option 2021 option 2021 option 2022 option 2023 diff --git a/src/views/404.html b/src/views/404.html index ca006bfe5..9b00e38d9 100644 --- a/src/views/404.html +++ b/src/views/404.html @@ -1,9 +1,9 @@ @@ -51,22 +51,23 @@ gtag('config', 'UA-118965717-5'); - -
-
-
-
-

404

-

Oops! You're lost.

-

The page you are looking for was not found.

-
-
-
- + +
+
+
+
+
+

404

+

Oops! You're lost.

+

The page you are looking for was not found.

+
+
+ -
- - + + + +
diff --git a/src/views/500.html b/src/views/500.html index 82b3775f4..e1b6f1955 100644 --- a/src/views/500.html +++ b/src/views/500.html @@ -1,9 +1,9 @@ @@ -51,22 +51,23 @@ gtag('config', 'UA-118965717-5'); - -
-
-
-
-

500

-

Houston, we have a problem!

-

The page you are looking for is temporarily unavailable.

-
-
-
- + +
+
+
+
+
+

500

+

Houston, we have a problem!

+

The page you are looking for is temporarily unavailable.

+
+
+ -
- - + + + +
diff --git a/src/views/base/accordion.html b/src/views/base/accordion.html index fd69a7903..72ac32228 100644 --- a/src/views/base/accordion.html +++ b/src/views/base/accordion.html @@ -1,9 +1,9 @@ @@ -51,8 +51,8 @@ gtag('config', 'UA-118965717-5'); - -