github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

update to bootstrap v5.0.2

pull/3891/head
Daniel 2021-07-11 21:49:32 +05:30
parent aea69fb70a
commit 5b78c5f04f
6 changed files with 197 additions and 1264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gulpfile.js
View File

@ -13,14 +13,12 @@ const gulpIf = require('gulp-if')
const npmDist = require('gulp-npm-dist') const npmDist = require('gulp-npm-dist')
const postcss = require('gulp-postcss') const postcss = require('gulp-postcss')
const rename = require('gulp-rename') const rename = require('gulp-rename')
const sass = require('gulp-sass') const sass = require('gulp-sass')(require('sass'))
const gulpStylelint = require('gulp-stylelint') const gulpStylelint = require('gulp-stylelint')
const rollup = require('rollup') const rollup = require('rollup')
const rollupTypescript = require('@rollup/plugin-typescript') const rollupTypescript = require('@rollup/plugin-typescript')
const rtlcss = require('rtlcss') const rtlcss = require('rtlcss')
sass.compiler = require('sass')
const pkg = require('./package') const pkg = require('./package')
const year = new Date().getFullYear() const year = new Date().getFullYear()
const banner = `/*! const banner = `/*!

1370
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

26
package.json
View File

@ -38,22 +38,22 @@
"@fortawesome/fontawesome-free": "^5.15.3", "@fortawesome/fontawesome-free": "^5.15.3",
"@popperjs/core": "^2.9.2", "@popperjs/core": "^2.9.2",
"bootstrap": "^5.0.2", "bootstrap": "^5.0.2",
"chart.js": "^3.3.2", "chart.js": "^3.4.1",
"overlayscrollbars": "^1.13.1" "overlayscrollbars": "^1.13.1"
}, },
"devDependencies": { "devDependencies": {
"@rollup/plugin-typescript": "^8.2.1", "@rollup/plugin-typescript": "^8.2.1",
"@typescript-eslint/eslint-plugin": "^4.28.0", "@typescript-eslint/eslint-plugin": "^4.28.2",
"@typescript-eslint/parser": "^4.28.0", "@typescript-eslint/parser": "^4.28.2",
"autoprefixer": "^10.2.6", "autoprefixer": "^10.3.0",
"browser-sync": "^2.26.14", "browser-sync": "^2.27.4",
"bundlewatch": "^0.3.2", "bundlewatch": "^0.3.2",
"del": "^6.0.0", "del": "^6.0.0",
"eslint": "^7.29.0", "eslint": "^7.30.0",
"eslint-config-xo": "^0.37.0", "eslint-config-xo": "^0.37.0",
"eslint-config-xo-typescript": "^0.42.0", "eslint-config-xo-typescript": "^0.43.0",
"eslint-plugin-import": "^2.23.4", "eslint-plugin-import": "^2.23.4",
"eslint-plugin-unicorn": "^33.0.1", "eslint-plugin-unicorn": "^34.0.1",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"gulp-clean-css": "^4.3.0", "gulp-clean-css": "^4.3.0",
"gulp-eslint7": "^0.3.1", "gulp-eslint7": "^0.3.1",
@ -62,16 +62,16 @@
"gulp-npm-dist": "^1.0.3", "gulp-npm-dist": "^1.0.3",
"gulp-postcss": "^9.0.0", "gulp-postcss": "^9.0.0",
"gulp-rename": "^2.0.0", "gulp-rename": "^2.0.0",
"gulp-sass": "^4.1.0", "gulp-sass": "^5.0.0",
"gulp-stylelint": "^13.0.0", "gulp-stylelint": "^13.0.0",
"lockfile-lint": "^4.6.2", "lockfile-lint": "^4.6.2",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"postcss": "^8.3.5", "postcss": "^8.3.5",
"rollup": "^2.52.2", "rollup": "^2.53.1",
"rtlcss": "^3.2.1", "rtlcss": "^3.3.0",
"sass": "1.32.13", "sass": "^1.35.2",
"stylelint": "^13.13.1", "stylelint": "^13.13.1",
"stylelint-config-twbs-bootstrap": "^2.2.1", "stylelint-config-twbs-bootstrap": "^2.2.1",
"typescript": "^4.3.4" "typescript": "^4.3.5"
} }
} }

49
src/scss/_bootstrap-variables.scss
View File

@ -253,8 +253,8 @@ $gradient: linear-gradient(180deg, rgba($white, .15), rgba($white, 0)) !default;
$spacer: 1rem !default; $spacer: 1rem !default;
$spacers: ( $spacers: (
0: 0, 0: 0,
1: $spacer / 4, 1: $spacer * .25,
2: $spacer / 2, 2: $spacer * .5,
3: $spacer, 3: $spacer,
4: $spacer * 1.5, 4: $spacer * 1.5,
5: $spacer * 3, 5: $spacer * 3,
@ -353,7 +353,7 @@ $gutters: $spacers !default;
// Container padding // Container padding
$container-padding-x: $grid-gutter-width / 2 !default; $container-padding-x: $grid-gutter-width * .5 !default;
// Components // Components
@ -419,20 +419,21 @@ $aspect-ratios: (
// scss-docs-start font-variables // scss-docs-start font-variables
// stylelint-disable value-keyword-case // stylelint-disable value-keyword-case
$font-family-sans-serif: "Source Sans Pro", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; // adminlte-modified $font-family-sans-serif: "Source Sans Pro", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; // adminlte-modified
$font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; $font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
// stylelint-enable value-keyword-case // stylelint-enable value-keyword-case
$font-family-base: var(--#{$variable-prefix}font-sans-serif) !default; $font-family-base: var(--#{$variable-prefix}font-sans-serif) !default;
$font-family-code: var(--#{$variable-prefix}font-monospace) !default; $font-family-code: var(--#{$variable-prefix}font-monospace) !default;
// $font-size-root effects the value of `rem`, which is used for as well font sizes, paddings and margins // $font-size-root affects the value of `rem`, which is used for as well font sizes, paddings, and margins
// $font-size-base effects the font size of the body text // $font-size-base affects the font size of the body text
$font-size-root: null !default; $font-size-root: null !default;
$font-size-base: 1rem !default; // Assumes the browser default, typically `16px` $font-size-base: 1rem !default; // Assumes the browser default, typically `16px`
$font-size-sm: $font-size-base * .875 !default; $font-size-sm: $font-size-base * .875 !default;
$font-size-lg: $font-size-base * 1.25 !default; $font-size-lg: $font-size-base * 1.25 !default;
$font-size-xs: $font-size-base * .75 !default; // adminlte-modified $font-size-xs: $font-size-base * .75 !default; // adminlte-modified
$font-size-xl: $font-size-base * 2 !default; // adminlte-modified $font-size-xl: $font-size-base * 2 !default; // adminlte-modified
$font-weight-lighter: lighter !default; $font-weight-lighter: lighter !default;
$font-weight-light: 300 !default; $font-weight-light: 300 !default;
$font-weight-normal: 400 !default; $font-weight-normal: 400 !default;
@ -469,7 +470,7 @@ $font-sizes: (
// scss-docs-end font-sizes // scss-docs-end font-sizes
// scss-docs-start headings-variables // scss-docs-start headings-variables
$headings-margin-bottom: $spacer / 2 !default; $headings-margin-bottom: $spacer * .5 !default;
$headings-font-family: null !default; $headings-font-family: null !default;
$headings-font-style: null !default; $headings-font-style: null !default;
$headings-font-weight: 500 !default; $headings-font-weight: 500 !default;
@ -534,8 +535,8 @@ $mark-bg: #fcf8e3 !default;
// Customizes the `.table` component with basic values, each used across all table variations. // Customizes the `.table` component with basic values, each used across all table variations.
// scss-docs-start table-variables // scss-docs-start table-variables
$table-cell-padding-y: .75rem !default; // adminlte-modified $table-cell-padding-y: .5rem !default;
$table-cell-padding-x: .75rem !default; // adminlte-modified $table-cell-padding-x: .5rem !default;
$table-cell-padding-y-sm: .25rem !default; $table-cell-padding-y-sm: .25rem !default;
$table-cell-padding-x-sm: .25rem !default; $table-cell-padding-x-sm: .25rem !default;
@ -543,6 +544,7 @@ $table-cell-vertical-align: top !default;
$table-color: $body-color !default; $table-color: $body-color !default;
$table-bg: transparent !default; $table-bg: transparent !default;
$table-accent-bg: transparent !default;
$table-th-font-weight: null !default; $table-th-font-weight: null !default;
@ -725,7 +727,7 @@ $input-height-border: $input-border-width * 2 !default;
$input-height-inner: add($input-line-height * 1em, $input-padding-y * 2) !default; $input-height-inner: add($input-line-height * 1em, $input-padding-y * 2) !default;
$input-height-inner-half: add($input-line-height * .5em, $input-padding-y) !default; $input-height-inner-half: add($input-line-height * .5em, $input-padding-y) !default;
$input-height-inner-quarter: add($input-line-height * .25em, $input-padding-y / 2) !default; $input-height-inner-quarter: add($input-line-height * .25em, $input-padding-y * .5) !default;
$input-height: add($input-line-height * 1em, add($input-padding-y * 2, $input-height-border, false)) !default; $input-height: add($input-line-height * 1em, add($input-padding-y * 2, $input-height-border, false)) !default;
$input-height-sm: add($input-line-height * 1em, add($input-padding-y-sm * 2, $input-height-border, false)) !default; $input-height-sm: add($input-line-height * 1em, add($input-padding-y-sm * 2, $input-height-border, false)) !default;
@ -735,7 +737,7 @@ $input-transition: border-color .15s ease-in-out, box-shado
// scss-docs-end form-input-variables // scss-docs-end form-input-variables
// scss-docs-start form-check-variables // scss-docs-start form-check-variables
$form-check-input-width: 1.125em !default; // adminlte-modified $form-check-input-width: 1em !default;
$form-check-min-height: $font-size-base * $line-height-base !default; $form-check-min-height: $font-size-base * $line-height-base !default;
$form-check-padding-start: $form-check-input-width + .5em !default; $form-check-padding-start: $form-check-input-width + .5em !default;
$form-check-margin-bottom: .125rem !default; $form-check-margin-bottom: .125rem !default;
@ -833,6 +835,8 @@ $form-select-font-size-sm: $input-font-size-sm !default;
$form-select-padding-y-lg: $input-padding-y-lg !default; $form-select-padding-y-lg: $input-padding-y-lg !default;
$form-select-padding-x-lg: $input-padding-x-lg !default; $form-select-padding-x-lg: $input-padding-x-lg !default;
$form-select-font-size-lg: $input-font-size-lg !default; $form-select-font-size-lg: $input-font-size-lg !default;
$form-select-transition: $input-transition !default;
// scss-docs-end form-select-variables // scss-docs-end form-select-variables
// scss-docs-start form-range-variables // scss-docs-start form-range-variables
@ -864,6 +868,7 @@ $form-file-button-hover-bg: shade-color($form-file-button-bg, 5%) !default
// scss-docs-start form-floating-variables // scss-docs-start form-floating-variables
$form-floating-height: add(3.5rem, $input-height-border) !default; $form-floating-height: add(3.5rem, $input-height-border) !default;
$form-floating-line-height: 1.25 !default;
$form-floating-padding-x: $input-padding-x !default; $form-floating-padding-x: $input-padding-x !default;
$form-floating-padding-y: 1rem !default; $form-floating-padding-y: 1rem !default;
$form-floating-input-padding-t: 1.625rem !default; $form-floating-input-padding-t: 1.625rem !default;
@ -947,7 +952,7 @@ $nav-pills-link-active-bg: $component-active-bg !default;
// Navbar // Navbar
// scss-docs-start navbar-variables // scss-docs-start navbar-variables
$navbar-padding-y: $spacer / 2 !default; $navbar-padding-y: $spacer * .5 !default;
$navbar-padding-x: null !default; $navbar-padding-x: null !default;
$navbar-nav-link-padding-x: 1rem !default; // adminlte-modified $navbar-nav-link-padding-x: 1rem !default; // adminlte-modified
@ -956,7 +961,7 @@ $navbar-brand-font-size: $font-size-lg !default;
// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link // Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
$nav-link-height: $font-size-base * $line-height-base + $nav-link-padding-y * 2 !default; $nav-link-height: $font-size-base * $line-height-base + $nav-link-padding-y * 2 !default;
$navbar-brand-height: $navbar-brand-font-size * $line-height-base !default; $navbar-brand-height: $navbar-brand-font-size * $line-height-base !default;
$navbar-brand-padding-y: ($nav-link-height - $navbar-brand-height) / 2 !default; $navbar-brand-padding-y: ($nav-link-height - $navbar-brand-height) * .5 !default;
$navbar-brand-margin-end: 1rem !default; $navbar-brand-margin-end: 1rem !default;
$navbar-toggler-padding-y: .25rem !default; $navbar-toggler-padding-y: .25rem !default;
@ -1006,7 +1011,7 @@ $dropdown-border-radius: $border-radius !default;
$dropdown-border-width: $border-width !default; $dropdown-border-width: $border-width !default;
$dropdown-inner-border-radius: subtract($dropdown-border-radius, $dropdown-border-width) !default; $dropdown-inner-border-radius: subtract($dropdown-border-radius, $dropdown-border-width) !default;
$dropdown-divider-bg: $dropdown-border-color !default; $dropdown-divider-bg: $dropdown-border-color !default;
$dropdown-divider-margin-y: $spacer / 2 !default; $dropdown-divider-margin-y: $spacer * .5 !default;
$dropdown-box-shadow: $box-shadow !default; $dropdown-box-shadow: $box-shadow !default;
$dropdown-link-color: $gray-900 !default; $dropdown-link-color: $gray-900 !default;
@ -1018,7 +1023,7 @@ $dropdown-link-active-bg: $component-active-bg !default;
$dropdown-link-disabled-color: $gray-500 !default; $dropdown-link-disabled-color: $gray-500 !default;
$dropdown-item-padding-y: $spacer / 4 !default; $dropdown-item-padding-y: $spacer * .25 !default;
$dropdown-item-padding-x: $spacer !default; $dropdown-item-padding-x: $spacer !default;
$dropdown-header-color: $gray-600 !default; $dropdown-header-color: $gray-600 !default;
@ -1087,12 +1092,12 @@ $pagination-border-radius-lg: $border-radius-lg !default;
// scss-docs-start card-variables // scss-docs-start card-variables
$card-spacer-y: $spacer !default; $card-spacer-y: $spacer !default;
$card-spacer-x: $spacer !default; $card-spacer-x: $spacer !default;
$card-title-spacer-y: $spacer / 2 !default; $card-title-spacer-y: $spacer * .5 !default;
$card-border-width: $border-width !default; $card-border-width: $border-width !default;
$card-border-radius: $border-radius !default; $card-border-radius: $border-radius !default;
$card-border-color: rgba($black, .125) !default; $card-border-color: rgba($black, .125) !default;
$card-inner-border-radius: subtract($card-border-radius, $card-border-width) !default; $card-inner-border-radius: subtract($card-border-radius, $card-border-width) !default;
$card-cap-padding-y: $card-spacer-y / 2 !default; $card-cap-padding-y: $card-spacer-y * .5 !default;
$card-cap-padding-x: $card-spacer-x !default; $card-cap-padding-x: $card-spacer-x !default;
$card-cap-bg: rgba($black, .03) !default; $card-cap-bg: rgba($black, .03) !default;
$card-cap-color: null !default; $card-cap-color: null !default;
@ -1100,7 +1105,7 @@ $card-height: null !default;
$card-color: null !default; $card-color: null !default;
$card-bg: $white !default; $card-bg: $white !default;
$card-img-overlay-padding: $spacer !default; $card-img-overlay-padding: $spacer !default;
$card-group-margin: $grid-gutter-width / 2 !default; $card-group-margin: $grid-gutter-width * .5 !default;
// scss-docs-end card-variables // scss-docs-end card-variables
// Accordion // Accordion
@ -1148,8 +1153,8 @@ $tooltip-color: $white !default;
$tooltip-bg: $black !default; $tooltip-bg: $black !default;
$tooltip-border-radius: $border-radius !default; $tooltip-border-radius: $border-radius !default;
$tooltip-opacity: .9 !default; $tooltip-opacity: .9 !default;
$tooltip-padding-y: $spacer / 4 !default; $tooltip-padding-y: $spacer * .25 !default;
$tooltip-padding-x: $spacer / 2 !default; $tooltip-padding-x: $spacer * .5 !default;
$tooltip-margin: 0 !default; $tooltip-margin: 0 !default;
$tooltip-arrow-width: .8rem !default; $tooltip-arrow-width: .8rem !default;
@ -1165,7 +1170,7 @@ $form-feedback-tooltip-font-size: $tooltip-font-size !default;
$form-feedback-tooltip-line-height: null !default; $form-feedback-tooltip-line-height: null !default;
$form-feedback-tooltip-opacity: $tooltip-opacity !default; $form-feedback-tooltip-opacity: $tooltip-opacity !default;
$form-feedback-tooltip-border-radius: $tooltip-border-radius !default; $form-feedback-tooltip-border-radius: $tooltip-border-radius !default;
// scss-docs-start tooltip-feedback-variables // scss-docs-end tooltip-feedback-variables
// Popovers // Popovers
@ -1315,7 +1320,7 @@ $list-group-border-color: rgba($black, .125) !default;
$list-group-border-width: $border-width !default; $list-group-border-width: $border-width !default;
$list-group-border-radius: $border-radius !default; $list-group-border-radius: $border-radius !default;
$list-group-item-padding-y: $spacer / 2 !default; $list-group-item-padding-y: $spacer * .5 !default;
$list-group-item-padding-x: $spacer !default; $list-group-item-padding-x: $spacer !default;
$list-group-item-bg-scale: -80% !default; $list-group-item-bg-scale: -80% !default;
$list-group-item-color-scale: 40% !default; $list-group-item-color-scale: 40% !default;

10
src/scss/_cards.scss
View File

@ -213,7 +213,7 @@ html.maximized-card {
.card-header { .card-header {
background-color: transparent; background-color: transparent;
border-bottom: 1px solid $card-border-color; border-bottom: 1px solid $card-border-color;
padding: (($card-spacer-y / 2) * 2) $card-spacer-x; padding: (($card-spacer-y * .5) * 2) $card-spacer-x;
position: relative; position: relative;
@if $enable-rounded { @if $enable-rounded {
@ -226,13 +226,13 @@ html.maximized-card {
> .card-tools { > .card-tools {
float: right; float: right;
margin-right: -$card-spacer-x / 2; margin-right: -$card-spacer-x * .5;
.input-group, .input-group,
.nav, .nav,
.pagination { .pagination {
margin-bottom: -$card-spacer-y / 2.5; margin-bottom: -$card-spacer-y & .4;
margin-top: -$card-spacer-y / 2.5; margin-top: -$card-spacer-y & .4;
} }
[data-bs-toggle="tooltip"] { [data-bs-toggle="tooltip"] {
@ -258,7 +258,7 @@ html.maximized-card {
background-color: transparent; background-color: transparent;
color: $gray-500; color: $gray-500;
font-size: $font-size-sm; font-size: $font-size-sm;
margin: -(($card-spacer-y / 2) * 2) 0; margin: -(($card-spacer-y * .5) * 2) 0;
padding: .25rem .5rem; padding: .25rem .5rem;
.btn-group.show &, .btn-group.show &,

2
src/scss/_variables.scss
View File

@ -108,7 +108,7 @@ $lte-sidebar-light-header-color: var(--lte-sidebar-light-header-color) !
// -------------------------------------------------------- // --------------------------------------------------------
$lte-sidebar-mini-width: ($nav-link-padding-x + $lte-sidebar-padding-x + .8rem) * 2 !default; $lte-sidebar-mini-width: ($nav-link-padding-x + $lte-sidebar-padding-x + .8rem) * 2 !default;
$lte-sidebar-nav-icon-width: $lte-sidebar-mini-width - (($lte-sidebar-padding-x + $nav-link-padding-x) * 2) !default; $lte-sidebar-nav-icon-width: $lte-sidebar-mini-width - (($lte-sidebar-padding-x + $nav-link-padding-x) * 2) !default;
$lte-sidebar-user-image-width: $lte-sidebar-nav-icon-width + ($nav-link-padding-x / 2) !default; $lte-sidebar-user-image-width: $lte-sidebar-nav-icon-width + ($nav-link-padding-x * .5) !default;
// SIDEBAR HORIZONTAL // SIDEBAR HORIZONTAL
// -------------------------------------------------------- // --------------------------------------------------------