Skip to content

Commit adccb7f

Browse files
committed
Fixed build errors
1 parent 6389368 commit adccb7f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+8913
-14244
lines changed

.babelrc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
{
2-
"presets": ["@babel/preset-env"],
3-
"plugins": [
4-
"@babel/plugin-proposal-class-properties",
5-
"@babel/plugin-proposal-object-rest-spread"
6-
]
2+
"presets": ["@babel/preset-env"]
73
}

package-lock.json

Lines changed: 8731 additions & 14140 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,32 @@
1818
"devDependencies": {
1919
"@babel/core": "^7.24.5",
2020
"@babel/eslint-parser": "^7.24.5",
21-
"@babel/plugin-proposal-class-properties": "^7.13.0",
22-
"@babel/plugin-proposal-object-rest-spread": "^7.13.8",
2321
"@babel/plugin-transform-runtime": "^7.24.3",
2422
"@babel/preset-env": "^7.24.5",
2523
"@babel/runtime": "^7.24.5",
26-
"babel-core": "^6.26.3",
2724
"babel-loader": "^9.1.3",
28-
"babel-preset-env": "^1.7.0",
29-
"babel-preset-stage-0": "^6.24.1",
3025
"case-sensitive-paths-webpack-plugin": "^2.4.0",
3126
"copy-webpack-plugin": "^12.0.2",
3227
"cross-env": "^7.0.3",
3328
"css-loader": "^7.1.1",
3429
"css-minimizer-webpack-plugin": "^7.0.0",
35-
"eslint": "^8.55.0",
30+
"eslint": "^8.57.0",
3631
"eslint-config-airbnb-base": "^15.0.0",
3732
"eslint-plugin-import": "^2.29.1",
3833
"html-webpack-plugin": "^5.6.0",
39-
"imagemin-webpack-plugin": "^2.4.2",
4034
"mini-css-extract-plugin": "^2.9.0",
4135
"postcss": "^8.4.38",
4236
"postcss-loader": "^8.1.1",
4337
"postcss-preset-env": "^9.5.13",
4438
"sass": "^1.77.1",
4539
"sass-loader": "^14.2.1",
46-
"shx": "^0.3.3",
40+
"shx": "^0.3.4",
4741
"style-loader": "^4.0.0",
48-
"stylelint": "^16.5.0",
42+
"stylelint": "^16.6.1",
4943
"stylelint-config-standard": "^36.0.0",
5044
"webpack": "^5.91.0",
5145
"webpack-cli": "^5.1.4",
52-
"webpack-dashboard": "^3.3.1",
46+
"webpack-dashboard": "^3.3.6",
5347
"webpack-dev-server": "^5.0.4"
5448
},
5549
"dependencies": {
@@ -58,16 +52,15 @@
5852
"@fullcalendar/interaction": "^6.1.11",
5953
"@fullcalendar/list": "^6.1.11",
6054
"@fullcalendar/timegrid": "^6.1.11",
61-
"@popperjs/core": "^2.11.6",
62-
"babel-polyfill": "^6.26.0",
55+
"@popperjs/core": "^2.11.8",
6356
"bootstrap": "^5.3.3",
64-
"bootstrap-datepicker": "^1.9.0",
57+
"bootstrap-datepicker": "^1.10.0",
6558
"brand-colors": "^2.1.1",
6659
"chart.js": "^4.4.2",
6760
"datatables": "^1.10.18",
6861
"easy-pie-chart": "^2.1.7",
6962
"file-loader": "^6.2.0",
70-
"jquery": "^3.6.0",
63+
"jquery": "^3.7.1",
7164
"jquery-sparkline": "^2.4.0",
7265
"jvectormap": "^2.0.4",
7366
"load-google-maps-api": "^2.0.2",

src/assets/styles/index.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import 'spec/settings/index';
2-
@import 'spec/tools/index';
3-
@import "bootstrap/scss/bootstrap";
4-
@import 'spec/index';
5-
@import 'vendor/index';
1+
@use 'spec/settings/index' as *;
2+
@use 'spec/tools/index' as *;
3+
@use "bootstrap/scss/bootstrap" as *;
4+
@use 'spec/index' as *;
5+
@use 'vendor/index' as *;
66

src/assets/styles/spec/components/forms.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@use '../settings/baseColors' as *;
2+
@use '../settings/materialColors' as *;
3+
14
.checkbox label {
25
display: inline-block;
36
vertical-align: middle;
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
@import 'sidebar';
2-
@import 'topbar';
3-
@import 'pageContainer';
4-
@import 'progressBar';
5-
@import 'easyPieChart';
6-
@import 'forms';
7-
@import 'masonry';
8-
@import 'loader';
9-
@import 'footer';
1+
@use 'sidebar' as *;
2+
@use 'topbar' as *;
3+
@use 'pageContainer' as *;
4+
@use 'progressBar' as *;
5+
@use 'easyPieChart' as *;
6+
@use 'forms' as *;
7+
@use 'masonry' as *;
8+
@use 'loader' as *;
9+
@use 'footer' as *;

src/assets/styles/spec/components/pageContainer.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
@use '../settings/baseColors' as *;
2+
@use '../settings/breakpoints' as *;
3+
@use '../tools/mixins/mediaQueriesRanges' as *;
4+
15
// ---------------------------------------------------------
26
// @TOC
37
// ---------------------------------------------------------

src/assets/styles/spec/components/sidebar.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
@use '../settings/baseColors' as *;
2+
@use '../tools/mixins/mediaQueriesRanges' as *;
3+
@use '../settings/breakpoints' as *;
4+
@use '../tools/mixins/clearfix' as *;
5+
@use '../settings/materialColors' as *;
6+
17
// ---------------------------------------------------------
28
// @TOC
39
// ---------------------------------------------------------

src/assets/styles/spec/components/topbar.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
@use 'sass:color';
2+
@use '../settings/baseColors' as *;
3+
@use '../settings/breakpoints' as *;
4+
@use '../tools/mixins/mediaQueriesRanges' as *;
5+
@use '../tools/mixins/clearfix' as *;
6+
@use '../tools/mixins/placeholder' as *;
7+
18
// ---------------------------------------------------------
29
// @TOC
310

@@ -181,7 +188,7 @@
181188
}
182189

183190
@include placeholder {
184-
color: lighten($default-text-color, 20%);
191+
color: color.adjust($default-text-color, $lightness: 20%);
185192
font-style: italic;
186193
}
187194
}

src/assets/styles/spec/generic/base.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
@use '../settings/fonts' as *;
2+
@use '../settings/baseColors' as *;
3+
@use 'sass:color';
4+
15
html, html a, body {
26
-webkit-font-smoothing: antialiased;
37
}
@@ -25,14 +29,15 @@ h6 {
2529
font-family: $font-secondary;
2630
letter-spacing: 0.5px;
2731
line-height: 1.5;
32+
font-weight: 400;
2833

2934
a {
3035
font-family: $font-secondary;
3136
}
3237

3338
small {
3439
font-weight: 300;
35-
color: lighten($default-dark, 5%);
40+
color: color.adjust($default-dark, $lightness: 5%);
3641
}
3742
}
3843

0 commit comments

Comments
 (0)