From 0901bbef85d0252946c81c8045e5f429f287ece4 Mon Sep 17 00:00:00 2001 From: Renat Galin Date: Wed, 8 Sep 2021 03:55:33 +0500 Subject: [PATCH 1/7] node-sass -> dart-sass migration --- package.json | 2 +- .../styles/spec/settings/materialColors.scss | 2 +- src/assets/styles/spec/utils/colors.scss | 20 +-- .../styles/spec/utils/layout/utils/gap.scss | 122 +++++++++--------- 4 files changed, 74 insertions(+), 72 deletions(-) diff --git a/package.json b/package.json index f1ff80b..2965386 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "html-webpack-plugin": "^5.3.1", "imagemin-webpack-plugin": "^2.4.2", "mini-css-extract-plugin": "^1.6.0", - "node-sass": "^4.14.1", + "sass": "^1.39.0", "postcss": "^8.3.4", "postcss-loader": "^6.1.0", "postcss-preset-env": "^6.7.0", diff --git a/src/assets/styles/spec/settings/materialColors.scss b/src/assets/styles/spec/settings/materialColors.scss index 703cbf2..b7e8b3e 100755 --- a/src/assets/styles/spec/settings/materialColors.scss +++ b/src/assets/styles/spec/settings/materialColors.scss @@ -547,4 +547,4 @@ $md-colors: ( blue-grey-700 : #455a64, blue-grey-800 : #37474f, blue-grey-900 : #263238, -) !global; +); diff --git a/src/assets/styles/spec/utils/colors.scss b/src/assets/styles/spec/utils/colors.scss index 06c8513..f8d4a0c 100755 --- a/src/assets/styles/spec/utils/colors.scss +++ b/src/assets/styles/spec/utils/colors.scss @@ -10,11 +10,11 @@ // --------------------------------------------------------- @each $item, $color in $md-colors { - .c-#{$item}, .cH-#{$item}:hover { color: $color !important; } - .bgc-#{$item}, .bgcH-#{$item}:hover { background-color: $color !important; } - .bdc-#{$item}, .bdcH-#{$item}:hover { border-color: $color !important; } - .fill-#{$item}, .fillH-#{$item}:hover { fill: $color !important; } - .str-#{$item}, .strH-#{$item}:hover { stroke: $color !important; } + .c-#{"" + $item}, .cH-#{"" + $item}:hover { color: $color !important; } + .bgc-#{"" + $item}, .bgcH-#{"" + $item}:hover { background-color: $color !important; } + .bdc-#{"" + $item}, .bdcH-#{"" + $item}:hover { border-color: $color !important; } + .fill-#{"" + $item}, .fillH-#{"" + $item}:hover { fill: $color !important; } + .str-#{"" + $item}, .strH-#{"" + $item}:hover { stroke: $color !important; } } // --------------------------------------------------------- @@ -22,9 +22,9 @@ // --------------------------------------------------------- @each $item, $color in $grey-colors-alt { - .c-#{$item}, .cH-#{$item}:hover { color: $color !important; } - .bgc-#{$item}, .bgcH-#{$item}:hover { background-color: $color !important; } - .bdc-#{$item}, .bdcH-#{$item}:hover { border-color: $color !important; } - .fill-#{$item}, .fillH-#{$item}:hover { fill: $color !important; } - .str-#{$item}, .strH-#{$item}:hover { stroke: $color !important; } + .c-#{"" + $item}, .cH-#{"" + $item}:hover { color: $color !important; } + .bgc-#{"" + $item}, .bgcH-#{"" + $item}:hover { background-color: $color !important; } + .bdc-#{"" + $item}, .bdcH-#{"" + $item}:hover { border-color: $color !important; } + .fill-#{"" + $item}, .fillH-#{"" + $item}:hover { fill: $color !important; } + .str-#{"" + $item}, .strH-#{"" + $item}:hover { stroke: $color !important; } } diff --git a/src/assets/styles/spec/utils/layout/utils/gap.scss b/src/assets/styles/spec/utils/layout/utils/gap.scss index 5697ea2..def4473 100755 --- a/src/assets/styles/spec/utils/layout/utils/gap.scss +++ b/src/assets/styles/spec/utils/layout/utils/gap.scss @@ -1,3 +1,5 @@ +@use "sass:math"; + // --------------------------------------------------------- // @TOC // --------------------------------------------------------- @@ -29,60 +31,60 @@ $responsive: true; @for $i from 0 through 4 { .gapX-#{$i} { - margin-left: #{($i / -2)}px !important; - margin-right: #{($i / -2)}px !important; + margin-left: #{math.div($i, -2)}px !important; + margin-right: #{math.div($i, -2)}px !important; & > * { - padding-left: #{($i / 2)}px !important; - padding-right: #{($i / 2)}px !important; + padding-left: #{math.div($i, 2)}px !important; + padding-right: #{math.div($i, 2)}px !important; } } .gapY-#{$i} { - margin-top: #{($i / -2)}px !important; - margin-bottom: #{($i / -2)}px !important; + margin-top: #{math.div($i, -2)}px !important; + margin-bottom: #{math.div($i, -2)}px !important; & > * { - padding-top: #{($i / 2)}px !important; - padding-bottom: #{($i / 2)}px !important; + padding-top: #{math.div($i, 2)}px !important; + padding-bottom: #{math.div($i, 2)}px !important; } } .gap-#{$i} { - margin: #{($i / -2)}px !important; + margin: #{math.div($i, -2)}px !important; & > * { - padding: #{($i / 2)}px !important; + padding: #{math.div($i, 2)}px !important; } } @if ($responsive == true) { @include generateResponsive() { .gapX-#{$i}\@#{$breakpointAlias} { - margin-left: #{($i / -2)}px !important; - margin-right: #{($i / -2)}px !important; + margin-left: #{math.div($i, -2)}px !important; + margin-right: #{math.div($i, -2)}px !important; & > * { - padding-left: #{($i / 2)}px !important; - padding-right: #{($i / 2)}px !important; + padding-left: #{math.div($i, 2)}px !important; + padding-right: #{math.div($i, 2)}px !important; } } .gapY-#{$i}\@#{$breakpointAlias} { - margin-top: #{($i / -2)}px !important; - margin-bottom: #{($i / -2)}px !important; + margin-top: #{math.div($i, -2)}px !important; + margin-bottom: #{math.div($i, -2)}px !important; & > * { - padding-top: #{($i / 2)}px !important; - padding-bottom: #{($i / 2)}px !important; + padding-top: #{math.div($i, 2)}px !important; + padding-bottom: #{math.div($i, 2)}px !important; } } .gap-#{$i}\@#{$breakpointAlias} { - margin: #{($i / -2)}px !important; + margin: #{math.div($i, -2)}px !important; & > * { - padding: #{($i / 2)}px !important; + padding: #{math.div($i, 2)}px !important; } } } @@ -96,60 +98,60 @@ $responsive: true; @for $i from 5 through 35 { @if $i % 5 == 0 { .gapX-#{$i} { - margin-left: #{($i / -2)}px !important; - margin-right: #{($i / -2)}px !important; + margin-left: #{math.div($i, -2)}px !important; + margin-right: #{math.div($i, -2)}px !important; & > * { - padding-left: #{($i / 2)}px !important; - padding-right: #{($i / 2)}px !important; + padding-left: #{math.div($i, 2)}px !important; + padding-right: #{math.div($i, 2)}px !important; } } .gapY-#{$i} { - margin-top: #{($i / -2)}px !important; - margin-bottom: #{($i / -2)}px !important; + margin-top: #{math.div($i, -2)}px !important; + margin-bottom: #{math.div($i, -2)}px !important; & > * { - padding-top: #{($i / 2)}px !important; - padding-bottom: #{($i / 2)}px !important; + padding-top: #{math.div($i, 2)}px !important; + padding-bottom: #{math.div($i, 2)}px !important; } } .gap-#{$i} { - margin: #{($i / -2)}px !important; + margin: #{math.div($i, -2)}px !important; & > * { - padding: #{($i / 2)}px !important; + padding: #{math.div($i, 2)}px !important; } } @if ($responsive == true) { @include generateResponsive() { .gapX-#{$i}\@#{$breakpointAlias} { - margin-left: #{($i / -2)}px !important; - margin-right: #{($i / -2)}px !important; + margin-left: #{math.div($i, -2)}px !important; + margin-right: #{math.div($i, -2)}px !important; & > * { - padding-left: #{($i / 2)}px !important; - padding-right: #{($i / 2)}px !important; + padding-left: #{math.div($i, 2)}px !important; + padding-right: #{math.div($i, 2)}px !important; } } .gapY-#{$i}\@#{$breakpointAlias} { - margin-top: #{($i / -2)}px !important; - margin-bottom: #{($i / -2)}px !important; + margin-top: #{math.div($i, -2)}px !important; + margin-bottom: #{math.div($i, -2)}px !important; & > * { - padding-top: #{($i / 2)}px !important; - padding-bottom: #{($i / 2)}px !important; + padding-top: #{math.div($i, 2)}px !important; + padding-bottom: #{math.div($i, 2)}px !important; } } .gap-#{$i}\@#{$breakpointAlias} { - margin: #{($i / -2)}px !important; + margin: #{math.div($i, -2)}px !important; & > * { - padding: #{($i / 2)}px !important; + padding: #{math.div($i, 2)}px !important; } } } @@ -164,60 +166,60 @@ $responsive: true; @for $i from 40 through 160 { @if $i % 10 == 0 { .gapX-#{$i} { - margin-left: #{($i / -2)}px !important; - margin-right: #{($i / -2)}px !important; + margin-left: #{math.div($i, -2)}px !important; + margin-right: #{math.div($i, -2)}px !important; & > * { - padding-left: #{($i / 2)}px !important; - padding-right: #{($i / 2)}px !important; + padding-left: #{math.div($i, 2)}px !important; + padding-right: #{math.div($i, 2)}px !important; } } .gapY-#{$i} { - margin-top: #{($i / -2)}px !important; - margin-bottom: #{($i / -2)}px !important; + margin-top: #{math.div($i, -2)}px !important; + margin-bottom: #{math.div($i, -2)}px !important; & > * { - padding-top: #{($i / 2)}px !important; - padding-bottom: #{($i / 2)}px !important; + padding-top: #{math.div($i, 2)}px !important; + padding-bottom: #{math.div($i, 2)}px !important; } } .gap-#{$i} { - margin: #{($i / -2)}px !important; + margin: #{math.div($i, -2)}px !important; & > * { - padding: #{($i / 2)}px !important; + padding: #{math.div($i, 2)}px !important; } } @if ($responsive == true) { @include generateResponsive() { .gapX-#{$i}\@#{$breakpointAlias} { - margin-left: #{($i / -2)}px !important; - margin-right: #{($i / -2)}px !important; + margin-left: #{math.div($i, -2)}px !important; + margin-right: #{math.div($i, -2)}px !important; & > * { - padding-left: #{($i / 2)}px !important; - padding-right: #{($i / 2)}px !important; + padding-left: #{math.div($i, 2)}px !important; + padding-right: #{math.div($i, 2)}px !important; } } .gapY-#{$i}\@#{$breakpointAlias} { - margin-top: #{($i / -2)}px !important; - margin-bottom: #{($i / -2)}px !important; + margin-top: #{math.div($i, -2)}px !important; + margin-bottom: #{math.div($i, -2)}px !important; & > * { - padding-top: #{($i / 2)}px !important; - padding-bottom: #{($i / 2)}px !important; + padding-top: #{math.div($i, 2)}px !important; + padding-bottom: #{math.div($i, 2)}px !important; } } .gap-#{$i}\@#{$breakpointAlias} { - margin: #{($i / -2)}px !important; + margin: #{math.div($i, -2)}px !important; & > * { - padding: #{($i / 2)}px !important; + padding: #{math.div($i, 2)}px !important; } } } From f92696b755af4170897d019a2d1e175c65e5bef0 Mon Sep 17 00:00:00 2001 From: Renat Galin Date: Wed, 12 Oct 2022 22:53:50 +0500 Subject: [PATCH 2/7] updates sass version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2965386..ee43b9c 100644 --- a/package.json +++ b/package.json @@ -36,10 +36,10 @@ "html-webpack-plugin": "^5.3.1", "imagemin-webpack-plugin": "^2.4.2", "mini-css-extract-plugin": "^1.6.0", - "sass": "^1.39.0", "postcss": "^8.3.4", "postcss-loader": "^6.1.0", "postcss-preset-env": "^6.7.0", + "sass": "^1.55.0", "sass-loader": "^12.1.0", "shx": "^0.3.3", "style-loader": "^2.0.0", From 0c58f11e3bdf0a73bf1d0dc0b76a858f601aff06 Mon Sep 17 00:00:00 2001 From: Renat Galin Date: Fri, 14 Oct 2022 11:49:08 +0500 Subject: [PATCH 3/7] Updates bootstrap and popper --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ee43b9c..34d5012 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.13.8", "@babel/plugin-transform-runtime": "^7.13.9", "@babel/runtime": "^7.13.9", - "@popperjs/core": "^2.9.2", + "@popperjs/core": "^2.11.6", "babel-core": "^6.26.3", "babel-loader": "^8.2.2", "babel-preset-env": "^1.7.0", @@ -57,7 +57,7 @@ "@fullcalendar/list": "^5.7.2", "@fullcalendar/timegrid": "^5.7.2", "babel-polyfill": "^6.26.0", - "bootstrap": "^5.0.1", + "bootstrap": "^5.2.2", "bootstrap-datepicker": "^1.9.0", "brand-colors": "^2.1.1", "chart.js": "^2.9.4", From 2919020d2748c666611e0f2f6c163be831f852c8 Mon Sep 17 00:00:00 2001 From: Renat Galin Date: Fri, 14 Oct 2022 11:57:50 +0500 Subject: [PATCH 4/7] Moves popperjs to main deps --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34d5012..c39bea9 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "@babel/plugin-proposal-object-rest-spread": "^7.13.8", "@babel/plugin-transform-runtime": "^7.13.9", "@babel/runtime": "^7.13.9", - "@popperjs/core": "^2.11.6", "babel-core": "^6.26.3", "babel-loader": "^8.2.2", "babel-preset-env": "^1.7.0", @@ -56,6 +55,7 @@ "@fullcalendar/interaction": "^5.7.2", "@fullcalendar/list": "^5.7.2", "@fullcalendar/timegrid": "^5.7.2", + "@popperjs/core": "^2.11.6", "babel-polyfill": "^6.26.0", "bootstrap": "^5.2.2", "bootstrap-datepicker": "^1.9.0", From 4194202b41115c8d0b845ec9743fac422a1b2678 Mon Sep 17 00:00:00 2001 From: Renat Galin Date: Fri, 14 Oct 2022 14:07:21 +0500 Subject: [PATCH 5/7] updates fullcalendar --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c39bea9..578eeb8 100644 --- a/package.json +++ b/package.json @@ -50,11 +50,11 @@ "webpack-dev-server": "^3.11.2" }, "dependencies": { - "@fullcalendar/core": "^5.7.2", - "@fullcalendar/daygrid": "^5.7.2", - "@fullcalendar/interaction": "^5.7.2", - "@fullcalendar/list": "^5.7.2", - "@fullcalendar/timegrid": "^5.7.2", + "@fullcalendar/core": "^5.11.3", + "@fullcalendar/daygrid": "^5.11.3", + "@fullcalendar/interaction": "^5.11.3", + "@fullcalendar/list": "^5.11.3", + "@fullcalendar/timegrid": "^5.11.3", "@popperjs/core": "^2.11.6", "babel-polyfill": "^6.26.0", "bootstrap": "^5.2.2", @@ -64,7 +64,7 @@ "datatables": "^1.10.18", "easy-pie-chart": "^2.1.7", "file-loader": "^6.2.0", - "fullcalendar": "^5.7.2", + "fullcalendar": "^5.11.3", "jquery": "^3.6.0", "jquery-sparkline": "^2.4.0", "jvectormap": "^2.0.4", From 62d34fdd039f2380012ab029c745afcd17719d4f Mon Sep 17 00:00:00 2001 From: jepperaskdk Date: Wed, 2 Aug 2023 20:14:17 +0200 Subject: [PATCH 6/7] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index db790ca..1a6f617 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "copy-webpack-plugin": "^9.0.0", "cross-env": "^7.0.3", "css-loader": "^5.2.6", - "css-minimizer-webpack-plugin": "^4.0.0", + "css-minimizer-webpack-plugin": "^5.0.1", "eslint": "^7.21.0", "eslint-config-airbnb-base": "^14.2.1", "eslint-plugin-import": "^2.23.4", @@ -40,7 +40,7 @@ "postcss": "^8.3.4", "postcss-loader": "^6.1.0", "sass": "^1.55.0", - "postcss-preset-env": "7.8.0", + "postcss-preset-env": "^6.7.0", "sass-loader": "^12.1.0", "shx": "^0.3.3", "style-loader": "^2.0.0", From 0b833fb35a523fc8718b5bb17ee256460efee7b4 Mon Sep 17 00:00:00 2001 From: jepperaskdk Date: Wed, 2 Aug 2023 20:17:08 +0200 Subject: [PATCH 7/7] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1a6f617..7252aef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "adminator", - "version": "2.0.3", + "version": "2.0.4", "private": true, "description": "HTML Admin Template", "scripts": {