diff --git a/build/npm/Publish.js b/build/npm/Publish.js index 4e65e05c3..46ae93870 100644 --- a/build/npm/Publish.js +++ b/build/npm/Publish.js @@ -28,7 +28,11 @@ class Publish { // Publish files Plugins.forEach((module) => { try { - fse.copySync(module.from, module.to) + if (fse.existsSync(module.from)) { + fse.copySync(module.from, module.to) + } else { + fse.copySync(module.from.replace('node_modules/', '../'), module.to) + } if (this.options.verbose) { console.log(`Copied ${module.from} to ${module.to}`) diff --git a/build/scss/_cards.scss b/build/scss/_cards.scss index dc764e899..fbd685290 100644 --- a/build/scss/_cards.scss +++ b/build/scss/_cards.scss @@ -108,10 +108,11 @@ html.maximized-card { float: right; margin-right: -$card-spacer-x / 2; + .input-group, .nav, .pagination { - margin-bottom: -$card-spacer-y / 2; - margin-top: -$card-spacer-y / 2; + margin-bottom: -$card-spacer-y / 2.5; + margin-top: -$card-spacer-y / 2.5; } [data-toggle='tooltip'] { diff --git a/build/scss/_mixins.scss b/build/scss/_mixins.scss index 68f03f9a3..b3e3dca45 100644 --- a/build/scss/_mixins.scss +++ b/build/scss/_mixins.scss @@ -513,7 +513,7 @@ // Accent Variant @mixin accent-variant($name, $color) { - &.accent-#{$name} { + .accent-#{$name} { $link-color: $color; $link-hover-color: darken($color, 15%); $pagination-active-bg: $color; diff --git a/build/scss/_navs.scss b/build/scss/_navs.scss index 5913cb04d..e8d0d578b 100644 --- a/build/scss/_navs.scss +++ b/build/scss/_navs.scss @@ -63,6 +63,15 @@ } } +.navbar-no-expand { + flex-direction: row; + + .nav-link { + padding-left: $navbar-nav-link-padding-x; + padding-right: $navbar-nav-link-padding-x; + } +} + // Color variants @each $color, $value in $theme-colors { @if $color == dark or $color == light { diff --git a/docs/index.md b/docs/index.md index 9c9136c21..374af488e 100755 --- a/docs/index.md +++ b/docs/index.md @@ -15,17 +15,17 @@ Visit the releases section on Github and download the [latest release](https://g ###### __Via NPM__ ```bash -npm install admin-lte@3.0.0-beta.2 --save +npm install admin-lte@v3-latest --save ``` ###### __Via Yarn__ ```bash -yarn add admin-lte@3.0.0-beta.2 +yarn add admin-lte@v3-latest ``` ###### __Via Bower__ ```bash -bower install admin-lte#3.0.0-beta.2 +bower install admin-lte#v3-latest ``` > If bower asks which version of jQuery to use, choose version 3 or above. {: .quote-info} diff --git a/package.json b/package.json index 8484a71c8..21f1335b0 100644 --- a/package.json +++ b/package.json @@ -84,6 +84,7 @@ "filterizr": "^2.2.3", "flag-icon-css": "^3.4.0", "flot": "^3.2.9", + "fs-extra": "^5.0.0", "icheck-bootstrap": "^3.0.1", "inputmask": "^4.0.8", "ion-rangeslider": "^2.3.0", @@ -120,7 +121,6 @@ "eslint": "^4.19.1", "eslint-plugin-compat": "^2.7.0", "extract-text-webpack-plugin": "^3.0.2", - "fs-extra": "^5.0.0", "node-sass": "^4.12.0", "node-sass-package-importer": "^5.3.2", "nodemon": "^1.19.1", diff --git a/pages/examples/invoice-print.html b/pages/examples/invoice-print.html index 2680cdc2f..ae2b9a203 100644 --- a/pages/examples/invoice-print.html +++ b/pages/examples/invoice-print.html @@ -18,7 +18,7 @@ - +
@@ -162,5 +162,9 @@
+ + diff --git a/pages/layout/top-nav.html b/pages/layout/top-nav.html index e52d779db..e7189ce6e 100644 --- a/pages/layout/top-nav.html +++ b/pages/layout/top-nav.html @@ -22,73 +22,77 @@ scratch. This page gets rid of all links and provides the needed markup only.
-