diff --git a/composer.json b/composer.json index 3ad6206..1494cd7 100644 --- a/composer.json +++ b/composer.json @@ -7,6 +7,7 @@ "laravel" ], "license": "MIT", + "version": "8.2.2", "require": { "php": "^8.0.2", "anlutro/l4-settings": "^1.3", diff --git a/resources/_keenthemes/src/js/components/search.js b/resources/_keenthemes/src/js/components/search.js index 97a91ea..8a1bfa2 100644 --- a/resources/_keenthemes/src/js/components/search.js +++ b/resources/_keenthemes/src/js/components/search.js @@ -50,6 +50,7 @@ var KTSearch = function(element, options) { the.toggleElement = _getElement('toggle'); the.submitElement = _getElement('submit'); the.toolbarElement = _getElement('toolbar'); + the.minLength = parseInt(_getOption('min-length')); the.resultsElement = _getElement('results'); the.suggestionElement = _getElement('suggestion'); @@ -146,7 +147,7 @@ var KTSearch = function(element, options) { var _focus = function() { the.element.classList.add('focus'); - if ( _getOption('show-on-focus') === true || the.inputElement.value.length >= minLength ) { + if ( _getOption('show-on-focus') === true || the.inputElement.value.length >= the.minLength ) { _show(); } } @@ -170,9 +171,7 @@ var KTSearch = function(element, options) { // Input var _input = function() { if ( _getOption('min-length') ) { - var minLength = parseInt(_getOption('min-length')); - - if ( the.inputElement.value.length >= minLength ) { + if ( the.inputElement.value.length >= the.minLength ) { _search(); } else if ( the.inputElement.value.length === 0 ) { _clear(); diff --git a/resources/_keenthemes/src/media/stock/600x600/img-87.jpg b/resources/_keenthemes/src/media/stock/600x600/img-87.jpg new file mode 100644 index 0000000..082e4be Binary files /dev/null and b/resources/_keenthemes/src/media/stock/600x600/img-87.jpg differ diff --git a/resources/_keenthemes/src/sass/components/_badge.scss b/resources/_keenthemes/src/sass/components/_badge.scss index 6886d3c..f1d7c05 100644 --- a/resources/_keenthemes/src/sass/components/_badge.scss +++ b/resources/_keenthemes/src/sass/components/_badge.scss @@ -63,13 +63,23 @@ &.badge-outline { border: 1px solid var(--#{$prefix}#{$name}); - color: var(--#{$prefix}#{$name}); background-color: transparent; + + @if $name == 'secondary' { + color: var(--#{$prefix}#{$name}-inverse); + } @else { + color: var(--#{$prefix}#{$name}); + } } } - .badge-light-#{$name} { - color: var(--#{$prefix}#{$name}); + .badge-light-#{$name} { background-color: var(--#{$prefix}#{$name}-light); + + @if $name == 'secondary' { + color: var(--#{$prefix}#{$name}-inverse); + } @else { + color: var(--#{$prefix}#{$name}); + } } } diff --git a/resources/_keenthemes/src/sass/components/_card.scss b/resources/_keenthemes/src/sass/components/_card.scss index 6ab6fbb..2941657 100644 --- a/resources/_keenthemes/src/sass/components/_card.scss +++ b/resources/_keenthemes/src/sass/components/_card.scss @@ -260,6 +260,10 @@ padding: $card-py $card-px !important; } +.card-border { + border: $card-border-width $card-border-style var(--#{$prefix}root-card-border-color) !important; +} + .card-px { padding-left: $card-px !important; padding-right: $card-px !important; diff --git a/resources/_keenthemes/src/sass/components/_variables.scss b/resources/_keenthemes/src/sass/components/_variables.scss index 629381d..ac54e4d 100644 --- a/resources/_keenthemes/src/sass/components/_variables.scss +++ b/resources/_keenthemes/src/sass/components/_variables.scss @@ -57,15 +57,15 @@ $primary-clarity: rgba(#1B84FF, 0.2) !default; $primary-inverse: $white !default; // Secondary colors -$secondary: #F9F9F9 !default; -$secondary-active: $gray-300 !default; +$secondary: $gray-200 !default; +$secondary-active: $gray-400 !default; $secondary-light: #F9F9F9 !default; $secondary-clarity: rgba(#F9F9F9, 0.2) !default; $secondary-inverse: $gray-800 !default; // Light colors $light: $gray-100 !default; -$light-active: #FCFCFC !default; +$light-active: $gray-200 !default; $light-light: #ffffff !default; $light-clarity: rgba($white, 0.2) !default; $light-inverse: $gray-800 !default; diff --git a/resources/_keenthemes/src/sass/components/buttons/_theme.scss b/resources/_keenthemes/src/sass/components/buttons/_theme.scss index 818c9eb..df520fc 100644 --- a/resources/_keenthemes/src/sass/components/buttons/_theme.scss +++ b/resources/_keenthemes/src/sass/components/buttons/_theme.scss @@ -60,6 +60,11 @@ .btn.btn-light-#{$name} { $color: var(--#{$prefix}#{$name}); $icon-color: var(--#{$prefix}#{$name}); + @if $name == 'secondary' { + $color: var(--#{$prefix}#{$name}-inverse); + $icon-color: var(--#{$prefix}#{$name}-inverse); + } + $border-color: var(--#{$prefix}#{$name}-light); $bg-color: var(--#{$prefix}#{$name}-light); @@ -112,6 +117,11 @@ $color-active: var(--#{$prefix}#{$name}); $icon-color-active: var(--#{$prefix}#{$name}); + @if $name == 'secondary' { + $color-active: var(--#{$prefix}#{$name}-inverse); + $icon-color-active: var(--#{$prefix}#{$name}-inverse); + } + $border-color-active: var(--#{$prefix}#{$name}-light); $bg-color-active: var(--#{$prefix}#{$name}-light); @@ -124,13 +134,27 @@ $color: var(--#{$prefix}#{$name}); $icon-color: var(--#{$prefix}#{$name}); $border-color: var(--#{$prefix}#{$name}); + + @if $name == 'secondary' { + $color: var(--#{$prefix}#{$name}-inverse); + $icon-color: var(--#{$prefix}#{$name}-inverse); + $border-color: var(--#{$prefix}#{$name}-inverse); + } + $bg-color: transparent; $color-active: var(--#{$prefix}#{$name}-active); $icon-color-active: var(--#{$prefix}#{$name}-active); $border-color-active: var(--#{$prefix}#{$name}); + @if $name == 'secondary' { + $color-active: var(--#{$prefix}#{$name}-inverse); + $icon-color-active: var(--#{$prefix}#{$name}-inverse); + $border-color-active: var(--#{$prefix}#{$name}-inverse); + } + $bg-color-active: var(--#{$prefix}#{$name}-light); + @include button-custom-variant($color, $icon-color, $border-color, $bg-color, $color-active, $icon-color-active, $border-color-active, $bg-color-active); } } @@ -257,6 +281,12 @@ $bg-color-active: get($value, base); $border-color-active: get($value, base); + @if $name == 'secondary' { + color: var(--#{$prefix}#{$name}-inverse); + } @else { + color: var(--#{$prefix}#{$name}); + } + @include button-custom-variant($color, $icon-color, $border-color, $bg-color, $color-active, $icon-color-active, $border-color-active, $bg-color-active); } } diff --git a/resources/_keenthemes/src/sass/components/helpers/_borders.scss b/resources/_keenthemes/src/sass/components/helpers/_borders.scss index 21e7dbe..68af155 100644 --- a/resources/_keenthemes/src/sass/components/helpers/_borders.scss +++ b/resources/_keenthemes/src/sass/components/helpers/_borders.scss @@ -21,6 +21,10 @@ // Hover border colors @each $name, $value in $theme-colors { + .border-#{$name}-clarity { + border-color: var(--#{$prefix}#{$name}-clarity) !important; + } + .border-hover-#{$name}:hover { border-color: var(--#{$prefix}#{$name}) !important; } @@ -30,6 +34,11 @@ } } +.border-hover-primary-clarity:hover, +.border-active-primary-clarity.active { + border-color: var(--#{$prefix}primary-clarity) !important; +} + // Hover transparent .border-hover-transparent:hover { border-color: transparent !important; diff --git a/resources/_keenthemes/src/sass/vendors/plugins/_datatables.scss b/resources/_keenthemes/src/sass/vendors/plugins/_datatables.scss index f396d40..dc44e20 100644 --- a/resources/_keenthemes/src/sass/vendors/plugins/_datatables.scss +++ b/resources/_keenthemes/src/sass/vendors/plugins/_datatables.scss @@ -266,7 +266,27 @@ table.dataTable tbody tr > .dtfc-fixed-right { // Child details .dtr-details { + display: table !important; + li { - display: flex; + display: table-row !important; + + .dtr-title { + padding-right: 0.75rem; + color: var(--#{$prefix}gray-900); + } + + .dtr-data { + color: var(--#{$prefix}gray-700); + } + + .dtr-title, + .dtr-data { + font-size: 1rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; + display: table-cell !important; + border-bottom: 1px solid var(--#{$prefix}border-color); + } } } diff --git a/resources/_keenthemes/tools/package.json b/resources/_keenthemes/tools/package.json index 418cb5b..1fcad4e 100644 --- a/resources/_keenthemes/tools/package.json +++ b/resources/_keenthemes/tools/package.json @@ -1,40 +1,40 @@ { "name": "keenthemes", - "version": "8.2.1", + "version": "1.0.0", "author": "Keenthemes", "homepage": "https://keenthemes.com/", "description": "Packages used by yarn, npm, gulp and webpack", "main": "gulpfile.js", "type": "module", "dependencies": { - "@ckeditor/ckeditor5-alignment": "40.0.0", - "@ckeditor/ckeditor5-build-balloon": "40.0.0", - "@ckeditor/ckeditor5-build-balloon-block": "40.0.0", - "@ckeditor/ckeditor5-build-classic": "40.0.0", - "@ckeditor/ckeditor5-build-decoupled-document": "40.0.0", - "@ckeditor/ckeditor5-build-inline": "40.0.0", - "@eonasdan/tempus-dominus": "^6.7.16", - "@fortawesome/fontawesome-free": "^6.4.2", + "@ckeditor/ckeditor5-alignment": "40.2.0", + "@ckeditor/ckeditor5-build-balloon": "40.2.0", + "@ckeditor/ckeditor5-build-balloon-block": "40.2.0", + "@ckeditor/ckeditor5-build-classic": "40.2.0", + "@ckeditor/ckeditor5-build-decoupled-document": "40.2.0", + "@ckeditor/ckeditor5-build-inline": "40.2.0", + "@eonasdan/tempus-dominus": "^6.9.4", + "@fortawesome/fontawesome-free": "^6.5.1", "@popperjs/core": "2.11.8", "@shopify/draggable": "^1.1.3", "@yaireo/tagify": "^4.17.9", "acorn": "^8.10.0", - "apexcharts": "3.44.0", + "apexcharts": "3.45.1", "autosize": "^6.0.1", - "axios": "^1.6.0", + "axios": "^1.6.2", "bootstrap": "5.3.2", "bootstrap-cookie-alert": "^1.2.2", "bootstrap-daterangepicker": "^3.1.0", - "bootstrap-icons": "^1.11.1", + "bootstrap-icons": "^1.11.2", "bootstrap-maxlength": "^1.10.1", "bootstrap-multiselectsplitter": "^1.0.4", "chalk": "^5.3.0", - "chart.js": "^4.4.0", + "chart.js": "^4.4.1", "clipboard": "^2.0.11", "countup.js": "^2.8.0", "cropperjs": "^1.6.1", - "datatables.net": "^1.13.6", - "datatables.net-bs5": "^1.13.6", + "datatables.net": "^1.13.8", + "datatables.net-bs5": "^1.13.8", "datatables.net-buttons": "^2.4.2", "datatables.net-buttons-bs5": "^2.4.2", "datatables.net-colreorder": "^1.7.0", @@ -51,15 +51,15 @@ "datatables.net-rowgroup-bs5": "^1.4.1", "datatables.net-rowreorder": "^1.4.1", "datatables.net-rowreorder-bs5": "^1.4.1", - "datatables.net-scroller": "^2.2.0", - "datatables.net-scroller-bs5": "^2.2.0", + "datatables.net-scroller": "^2.3.0", + "datatables.net-scroller-bs5": "^2.3.0", "datatables.net-select": "^1.7.0", "datatables.net-select-bs5": "^1.7.0", "dropzone": "^5.9.3", "es6-promise": "^4.2.8", "es6-promise-polyfill": "^1.2.0", "es6-shim": "^0.35.8", - "esri-leaflet": "^3.0.11", + "esri-leaflet": "^3.0.12", "esri-leaflet-geocoder": "^3.1.4", "flatpickr": "^4.6.13", "flot": "^4.2.6", @@ -77,8 +77,8 @@ "lozad": "^1.16.0", "moment": "^2.29.4", "nouislider": "^15.7.1", - "npm": "^10.2.1", - "pdfmake": "^0.2.7", + "npm": "^10.2.5", + "pdfmake": "^0.2.8", "prism-themes": "^1.9.0", "prismjs": "^1.29.0", "quill": "^1.3.7", @@ -88,7 +88,7 @@ "tiny-slider": "^2.9.4", "tinymce": "^5.8.2", "toastr": "^2.1.4", - "typed.js": "2.0.16", + "typed.js": "2.1.0", "vis-timeline": "^7.7.3", "wnumb": "^1.2.0" }, diff --git a/webpack.mix.js b/webpack.mix.js index 6d1cdc4..75b4062 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -54,17 +54,18 @@ mix.sass(`${dir}/sass/style.scss`, `public/assets/css/style.bundle.css`, {sassOp // Build custom 3rd party plugins (glob.sync(`resources/mix/vendors/**/*.js`) || []).forEach(file => { - mix.scripts(require('./' + file), `public/assets/${file.replace('resources/mix/vendors/', 'plugins/custom/')}`); + mix.scripts(require('./' + file), `public/assets/${file.replace(path.normalize('resources/mix/vendors/'), 'plugins/custom/')}`); }); (glob.sync(`resources/mix/vendors/**/*.scss`) || []).forEach(file => { - mix.sass(file, `public/assets/${file.replace('resources/mix/vendors/', 'plugins/custom/').replace('scss', 'css')}`); + mix.sass(file, `public/assets/${file.replace(path.normalize('resources/mix/vendors/'), 'plugins/custom/').replace('scss', 'css')}`); }); // JS pages (single page use) (glob.sync(`${dir}/js/custom/**/*.js`) || []).forEach(file => { - var output = `public/assets/${file.replace(`${dir}/`, '')}`; + var output = `public/assets${file.replace(path.normalize(dir), '')}`; mix.scripts(file, output); }); + // Override custom JS files (glob.sync(`resources/mix/custom/**/*.js`) || []).forEach(file => { var output = `public/assets/${file.replace(`resources/mix`, 'js')}`; @@ -132,7 +133,7 @@ mix.webpackConfig({ mix.copy(file, `public/assets/plugins/global/fonts/${path.parse(file).name}/${path.basename(file)}`); }); glob.sync('node_modules/+(@fortawesome|socicon|line-awesome|bootstrap-icons)/**/*.+(woff|woff2|eot|ttf)').forEach(file => { - const [, folder] = file.match(/node_modules\/(.*?)\//); + const [, folder] = file.match(/node_modules[\\|/](.*?)[\\|/]/); mix.copy(file, `public/assets/plugins/global/fonts/${folder}/${path.basename(file)}`); }); (glob.sync('node_modules/jstree/dist/themes/default/*.+(png|gif)') || []).forEach(file => {