Skip to content

Commit c415db1

Browse files
author
Yeliazar
committed
updated dependencies, migration boostrap v4 to v5
1 parent 59a40f8 commit c415db1

File tree

5 files changed

+339
-497
lines changed

5 files changed

+339
-497
lines changed

babel.config.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module.exports = {
33
'@vue/app'
44
],
55
plugins: [
6-
"@babel/plugin-proposal-optional-chaining"
6+
"@babel/plugin-proposal-optional-chaining",
7+
"@babel/plugin-syntax-optional-chaining"
78
]
89
};

package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"node": "node server.js"
1111
},
1212
"dependencies": {
13-
"@amcharts/amcharts4": "^4.10.17",
14-
"@amcharts/amcharts4-geodata": "^4.1.19",
13+
"@amcharts/amcharts4": "^4.10.26",
14+
"@amcharts/amcharts4-geodata": "^4.1.23",
1515
"@ckeditor/ckeditor5-build-classic": "^12.4.0",
1616
"@ckeditor/ckeditor5-vue": "^1.0.3",
1717
"@fullcalendar/core": "^4.4.2",
@@ -21,45 +21,45 @@
2121
"@fullcalendar/vue": "^4.4.2",
2222
"animate.css": "^4.1.1",
2323
"animated-number-vue": "^1.0.0",
24-
"apexcharts": "^3.26.0",
25-
"awesome-bootstrap-checkbox": "^1.0.1",
26-
"axios": "^0.23.0",
27-
"bootstrap": "^4.6.0",
28-
"bootstrap-vue": "2.21.2",
24+
"apexcharts": "^3.35.3",
25+
"awesome-bootstrap-checkbox": "https://github.com/flatlogic/awesome-bootstrap-checkbox#bump-to-bootstrap5",
26+
"axios": "^0.27.2",
27+
"bootstrap": "^5.1.3",
28+
"bootstrap-vue": "2.22.0",
2929
"chart.js": "^2.9.4",
30-
"chroma-js": "^2.1.1",
30+
"chroma-js": "^2.4.2",
3131
"css-loader": "^1.0.1",
3232
"echarts": "^4.9.0",
3333
"expose-loader": "^0.7.5",
3434
"font-awesome": "4.7.0",
3535
"glyphicons-halflings": "^1.9.1",
3636
"highcharts": "^7.2.2",
37-
"highcharts-vue": "^1.3.5",
37+
"highcharts-vue": "^1.4.0",
3838
"imports-loader": "^0.8.0",
3939
"jsonwebtoken": "^8.5.1",
4040
"line-awesome": "1.3.0",
41-
"mavon-editor": "^2.9.1",
42-
"moment": "^2.29.1",
41+
"mavon-editor": "^2.10.4",
42+
"moment": "^2.29.4",
4343
"node-sass": "^4.14.1",
4444
"rickshaw": "1.7.1",
4545
"sass-loader": "^7.3.1",
4646
"skycons": "^1.0.0",
47-
"v-calendar": "^1.0.8",
47+
"v-calendar": "^1.1.1",
4848
"v-mask": "^1.3.4",
4949
"vee-validate": "^2.2.15",
50-
"vue": "^2.6.12",
51-
"vue-apexcharts": "^1.6.1",
50+
"vue": "^2.7.6",
51+
"vue-apexcharts": "^1.6.2",
5252
"vue-bootstrap-slider": "2.1.8",
5353
"vue-carousel": "^0.18.0",
5454
"vue-chartjs": "^3.5.1",
55-
"vue-code-highlight": "^0.7.6",
55+
"vue-code-highlight": "^0.7.8",
5656
"vue-color": "^2.8.1",
5757
"vue-draggable-nested-tree": "^2.2.20",
5858
"vue-echarts": "^4.1.0",
5959
"vue-form-wizard": "^0.8.4",
6060
"vue-gallery": "^1.5.0",
6161
"vue-input-tag": "^2.0.7",
62-
"vue-router": "^3.5.2",
62+
"vue-router": "^3.5.4",
6363
"vue-select": "^2.6.4",
6464
"vue-tables-2": "^1.6.25",
6565
"vue-textarea-autosize": "^1.1.1",

src/styles/_mixins.scss

+102
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,105 @@
9696
background-color: $color;
9797
}
9898
}
99+
100+
// Hover mixin and `$enable-hover-media-query` are deprecated.
101+
//
102+
// Originally added during our alphas and maintained during betas, this mixin was
103+
// designed to prevent `:hover` stickiness on iOS-an issue where hover styles
104+
// would persist after initial touch.
105+
//
106+
// For backward compatibility, we've kept these mixins and updated them to
107+
// always return their regular pseudo-classes instead of a shimmed media query.
108+
//
109+
// Issue: https://github.com/twbs/bootstrap/issues/25195
110+
111+
@mixin hover() {
112+
&:hover { @content; }
113+
}
114+
115+
@mixin hover-focus() {
116+
&:hover,
117+
&:focus {
118+
@content;
119+
}
120+
}
121+
122+
@mixin plain-hover-focus() {
123+
&,
124+
&:hover,
125+
&:focus {
126+
@content;
127+
}
128+
}
129+
130+
@mixin hover-focus-active() {
131+
&:hover,
132+
&:focus,
133+
&:active {
134+
@content;
135+
}
136+
}
137+
138+
// stylelint-disable declaration-no-important
139+
140+
// Typography
141+
142+
@mixin text-emphasis-variant($parent, $color, $ignore-warning: false) {
143+
#{$parent} {
144+
color: $color !important;
145+
}
146+
@if $emphasized-link-hover-darken-percentage != 0 {
147+
a#{$parent} {
148+
@include hover-focus() {
149+
color: shade-color($color, $emphasized-link-hover-darken-percentage) !important;
150+
}
151+
}
152+
}
153+
//@include deprecate("`text-emphasis-variant()`", "v4.4.0", "v5", $ignore-warning);
154+
}
155+
156+
// stylelint-disable declaration-no-important
157+
158+
// Contextual backgrounds
159+
160+
@mixin bg-variant($parent, $color, $ignore-warning: false) {
161+
#{$parent} {
162+
background-color: $color !important;
163+
}
164+
a#{$parent},
165+
button#{$parent} {
166+
:hover, :focus {
167+
background-color: shade-color($color, 10) !important;
168+
}
169+
}
170+
//@include deprecate("The `bg-variant` mixin", "v4.4.0", "v5", $ignore-warning);
171+
}
172+
173+
@mixin bg-gradient-variant($parent, $color, $ignore-warning: false) {
174+
#{$parent} {
175+
background: $color linear-gradient(180deg, mix($body-bg, $color, 15%), $color) repeat-x !important;
176+
}
177+
//@include deprecate("The `bg-gradient-variant` mixin", "v4.5.0", "v5", $ignore-warning);
178+
}
179+
180+
@mixin badge-variant($bg) {
181+
color: color-contrast($bg);
182+
background-color: $bg;
183+
184+
@at-root a#{&} {
185+
@include hover-focus() {
186+
color: color-contrast($bg);
187+
background-color: ($bg, 10%);
188+
}
189+
190+
&:focus,
191+
&.focus {
192+
outline: 0;
193+
box-shadow: 0 0 0 $badge-focus-width rgba($bg, .5);
194+
}
195+
}
196+
}
197+
198+
@function theme-color($key: "primary") {
199+
@return map-get($theme-colors, $key);
200+
}

src/styles/_variables.scss

+6
Original file line numberDiff line numberDiff line change
@@ -227,3 +227,9 @@ $padding-small-horizontal: 0.75rem !default;
227227
// -------------------------
228228

229229
$screen-lg-height: 670px !default;
230+
231+
$blockquote-small-color: $gray-600 !default;
232+
$hr-border-color: rgba($black, .1) !default;
233+
$table-cell-padding: .75rem !default;
234+
$emphasized-link-hover-darken-percentage: 15% !default;
235+
$badge-focus-width: .2rem !default;

0 commit comments

Comments
 (0)