Skip to content

Commit 43b1199

Browse files
committed
- Update dependencies
- Fix layout
1 parent a6da660 commit 43b1199

File tree

4 files changed

+53
-41
lines changed

4 files changed

+53
-41
lines changed

changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## [v.1.0.4]
4+
5+
### Updated
6+
- Update dependencies
7+
- Fix layout
8+
39
## [v.1.0.3]
410

511
### Updated

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-material-admin-full",
3-
"version": "1.0.2",
3+
"version": "1.0.4",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve --port 3000",
@@ -9,24 +9,24 @@
99
"lint": "vue-cli-service lint"
1010
},
1111
"dependencies": {
12-
"@amcharts/amcharts4": "^4.10.5",
13-
"@amcharts/amcharts4-geodata": "^4.1.17",
14-
"apexcharts": "^3.22.0",
15-
"axios": "^0.21.0",
16-
"core-js": "^3.8.0",
12+
"@amcharts/amcharts4": "^4.10.14",
13+
"@amcharts/amcharts4-geodata": "^4.1.19",
14+
"apexcharts": "^3.24.0",
15+
"axios": "^0.21.1",
16+
"core-js": "^3.8.3",
1717
"cross-env": "^7.0.3",
1818
"css-loader": "^1.0.1",
1919
"font-awesome": "^4.7.0",
20-
"highcharts": "^8.2.0",
20+
"highcharts": "^8.2.2",
2121
"highcharts-vue": "^1.3.5",
2222
"jsonwebtoken": "^8.5.1",
2323
"moment": "^2.29.1",
2424
"vue": "^2.6.12",
2525
"vue-apexcharts": "^1.6.0",
26-
"vue-router": "^3.4.9",
26+
"vue-router": "^3.5.1",
2727
"vue2-google-maps": "^0.10.7",
2828
"vuetify": "^2.3.19",
29-
"vuex": "^3.6.0"
29+
"vuex": "^3.6.2"
3030
},
3131
"devDependencies": {
3232
"@vue/cli-plugin-babel": "~4.4.0",

src/components/Layout/Layout.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,11 @@ body {
1212
border-radius: 36px;
1313
border: none;
1414
}
15+
.v-main__wrap {
16+
padding: 70px $content-padding $content-padding;
17+
@media #{map-get($display-breakpoints, 'sm-and-down')} {
18+
padding: 70px $content-padding / 1.5 $content-padding / 1.5;
19+
}
20+
}
1521
}
1622

yarn.lock

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# yarn lockfile v1
33

44

5-
"@amcharts/amcharts4-geodata@^4.1.17":
6-
version "4.1.17"
7-
resolved "https://registry.yarnpkg.com/@amcharts/amcharts4-geodata/-/amcharts4-geodata-4.1.17.tgz#4c2a3c46254763f8abce887375f4ba9185bff94f"
8-
integrity sha512-ylzshiOq/aMRlVrRq8dOznZP7fp4xg/XkmhTjGm2dN6O1WqvoVBBOOnGyzrmb2gBlqN5zj59PQyOqSDyQUNe/Q==
5+
"@amcharts/amcharts4-geodata@^4.1.19":
6+
version "4.1.19"
7+
resolved "https://registry.yarnpkg.com/@amcharts/amcharts4-geodata/-/amcharts4-geodata-4.1.19.tgz#aa36f673ea3563e3f5549645db8ff85736b7f2ce"
8+
integrity sha512-y100J6mp8H95qfHPPmeAat8oC+VXJrpt+rnwOt554sEW6cFCWY6BKgPKL2dVlVbnz0U3dqNsyENOqXmp3Pu7vg==
99

10-
"@amcharts/amcharts4@^4.10.5":
11-
version "4.10.5"
12-
resolved "https://registry.yarnpkg.com/@amcharts/amcharts4/-/amcharts4-4.10.5.tgz#8167c959209b48b214d1f4672f4c248259525161"
13-
integrity sha512-H4PlVd4jSsD0V0loCg1Jd1gXMCqMaWwQabjd8qejP2lew2ZiXEaJ8eoIuXXoAakehCq/fewtgNO9lq95hdklvA==
10+
"@amcharts/amcharts4@^4.10.14":
11+
version "4.10.14"
12+
resolved "https://registry.yarnpkg.com/@amcharts/amcharts4/-/amcharts4-4.10.14.tgz#1263c77f6273d98f1138c56eed520f262a2d274e"
13+
integrity sha512-gzsbrJAbH9NIJ5zp1+O+Hy6lBT6POBZEBd7PVDd+ftnl63ERXxwNts96xVyEl43OKMDKFv5TpwPv06Cfgb+VAw==
1414
dependencies:
1515
"@babel/runtime" "^7.6.3"
1616
core-js "^3.0.0"
@@ -1522,10 +1522,10 @@ anymatch@~3.1.1:
15221522
normalize-path "^3.0.0"
15231523
picomatch "^2.0.4"
15241524

1525-
apexcharts@^3.22.0:
1526-
version "3.22.0"
1527-
resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.22.0.tgz#df6f1030d0d5bba605069907102d2c261afe97cb"
1528-
integrity sha512-DDh2eXnAEA8GoKU/hdicOaS2jzGehXwv8Bj1djYYudkeQzEdglFoWsVyIxff+Ds7+aUtVAJzd/9ythZuyyIbXQ==
1525+
apexcharts@^3.24.0:
1526+
version "3.24.0"
1527+
resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.24.0.tgz#0fc513e940448524ae9702d39ec287567522d1eb"
1528+
integrity sha512-iT6czJCIVrmAtrcO90MZTQCvC+xi6R6Acf0jNH/d40FVTtCfcqECuKIh5iAMyOTtgUb7+fQ8rbadH2bm1kbL9Q==
15291529
dependencies:
15301530
svg.draggable.js "^2.2.2"
15311531
svg.easing.js "^2.0.0"
@@ -1701,10 +1701,10 @@ aws4@^1.8.0:
17011701
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
17021702
integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
17031703

1704-
axios@^0.21.0:
1705-
version "0.21.0"
1706-
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.0.tgz#26df088803a2350dff2c27f96fef99fe49442aca"
1707-
integrity sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==
1704+
axios@^0.21.1:
1705+
version "0.21.1"
1706+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
1707+
integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
17081708
dependencies:
17091709
follow-redirects "^1.10.0"
17101710

@@ -2699,10 +2699,10 @@ core-js@^3.0.0, core-js@^3.6.5:
26992699
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
27002700
integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
27012701

2702-
core-js@^3.8.0:
2703-
version "3.8.0"
2704-
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.0.tgz#0fc2d4941cadf80538b030648bb64d230b4da0ce"
2705-
integrity sha512-W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA==
2702+
core-js@^3.8.3:
2703+
version "3.8.3"
2704+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0"
2705+
integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==
27062706

27072707
[email protected], core-util-is@~1.0.0:
27082708
version "1.0.2"
@@ -4604,10 +4604,10 @@ highcharts-vue@^1.3.5:
46044604
resolved "https://registry.yarnpkg.com/highcharts-vue/-/highcharts-vue-1.3.5.tgz#9a3e5f6050bf0227c19238433abfb17ab7262db3"
46054605
integrity sha512-By1kc3m8XoI20pMshs/ue69j4rH6eQioDPoIrtC20RTti4QyvNAx8DisGSO3GAWe9sn50hPk8NsyxcwZIGaz3Q==
46064606

4607-
highcharts@^8.2.0:
4608-
version "8.2.0"
4609-
resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-8.2.0.tgz#3d4893015caf1a7c9ed85284d983911e844649f3"
4610-
integrity sha512-s3R7UEaMWUDJNxFfdjuiOtI8rnSvhEZUNN4TA7LiDRc9Tw7DUKvTv5WXSTYzxojokLbybwwlf9t3jg/meAUTnQ==
4607+
highcharts@^8.2.2:
4608+
version "8.2.2"
4609+
resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-8.2.2.tgz#3eb1a694cff013d3385c3ca8e58e69a27be52cab"
4610+
integrity sha512-F63TXO7RxsvTcpO/KOubQZWualYpCMyCTuKtoWbt7KCsfQ3Kl7Fr6HEyyJdjkYl+XlnmnKlSRi9d3HjLK9Q0wg==
46114611

46124612
highlight.js@^9.6.0:
46134613
version "9.18.3"
@@ -9097,10 +9097,10 @@ vue-loader@^15.9.2:
90979097
vue-hot-reload-api "^2.3.0"
90989098
vue-style-loader "^4.1.0"
90999099

9100-
vue-router@^3.4.9:
9101-
version "3.4.9"
9102-
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz#c016f42030ae2932f14e4748b39a1d9a0e250e66"
9103-
integrity sha512-CGAKWN44RqXW06oC+u4mPgHLQQi2t6vLD/JbGRDAXm0YpMv0bgpKuU5bBd7AvMgfTz9kXVRIWKHqRwGEb8xFkA==
9100+
vue-router@^3.5.1:
9101+
version "3.5.1"
9102+
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.1.tgz#edf3cf4907952d1e0583e079237220c5ff6eb6c9"
9103+
integrity sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw==
91049104

91059105
vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
91069106
version "4.1.2"
@@ -9149,10 +9149,10 @@ vuetify@^2.3.19:
91499149
resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.3.19.tgz#94ae6a8b0e2d52266b2a47c6a11021c63aa1b7b0"
91509150
integrity sha512-xqaiSEv0SUrzcoYU/N+orF7crRrhFkZt2ZPSDyPdHhiL6vMOFSYyz0OyGX3lAFykX/FJJMkNPgYTdg1l7WD1jA==
91519151

9152-
vuex@^3.6.0:
9153-
version "3.6.0"
9154-
resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.0.tgz#95efa56a58f7607c135b053350833a09e01aa813"
9155-
integrity sha512-W74OO2vCJPs9/YjNjW8lLbj+jzT24waTo2KShI8jLvJW8OaIkgb3wuAMA7D+ZiUxDOx3ubwSZTaJBip9G8a3aQ==
9152+
vuex@^3.6.2:
9153+
version "3.6.2"
9154+
resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71"
9155+
integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==
91569156

91579157
watchpack-chokidar2@^2.0.0:
91589158
version "2.0.0"

0 commit comments

Comments
 (0)