Skip to content

Commit 6bc1304

Browse files
sajadevosajadevo
authored
Merge pull request #18 from creativetimofficial/feat/v3.1.0
Feat/v3.1.0
2 parents ad4a9d8 + 68c3f76 commit 6bc1304

File tree

17 files changed

+91
-73
lines changed

17 files changed

+91
-73
lines changed

‎.eslintrc.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
module.exports = {
22
root: true,
33
env: {
4-
node: true
4+
node: true,
55
},
66
extends: ["plugin:vue/vue3-essential", "eslint:recommended", "@vue/prettier"],
77
parserOptions: {
8-
parser: "babel-eslint"
8+
parser: "@babel/eslint-parser",
99
},
1010
rules: {
11+
"vue/multi-word-component-names": "off",
1112
"no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
1213
"no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
13-
"prettier/prettier": "off"
14-
}
14+
"prettier/prettier": "off",
15+
},
1516
};

‎.npmrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
legacy-peer-deps=true
2+
auto-install-peers=true
3+
strict-peer-dependencies=false

‎CHANGELOG.md‎

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

3+
## [3.1.0] 2023-10-15
4+
5+
- Update dependencies & devDependencies
6+
- Add support for two-way data binding to `MaterialInput`
7+
38
## [3.0.0] 2022-06-14
49

510
- Rename components name prefix from Vmd to Material

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# [Vue Material Dashboard 2](http://demos.creative-tim.com/vue-material-dashboard-2/#/?ref=readme-vmd2) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/intent/tweet?url=https://www.creative-tim.com/product/vue-material-dashboard-2&text=Check%20Vue%20Material%20Dashboard%202%20made%20by%20@CreativeTim%20#webdesign%20#dashboard%20#materialdesign%20#vue%20https://www.creative-tim.com/product/vue-material-dashboard)
22

3-
![version](https://img.shields.io/badge/version-3.0.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/vue-material-dashboard-2.svg)](https://github.com/creativetimofficial/vue-material-dashboard-2/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-material-dashboard-2.svg)](https://github.com/creativetimofficial/vue-material-dashboard-2/issues?q=is%3Aissue+is%3Aclosed)
3+
![version](https://img.shields.io/badge/version-3.1.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/vue-material-dashboard-2.svg)](https://github.com/creativetimofficial/vue-material-dashboard-2/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-material-dashboard-2.svg)](https://github.com/creativetimofficial/vue-material-dashboard-2/issues?q=is%3Aissue+is%3Aclosed)
44

55
![Image](https://s3.amazonaws.com/creativetim_bucket/products/596/original/vue-material-dashboard-2.jpg)
66

@@ -184,7 +184,7 @@ If you have questions or need help integrating the product please [contact us](h
184184

185185
## Licensing
186186

187-
- Copyright 2022 [Creative Tim](https://www.creative-tim.com?ref=readme-vmd2)
187+
- Copyright 2023 [Creative Tim](https://www.creative-tim.com?ref=readme-vmd2)
188188
- Creative Tim [license](https://www.creative-tim.com/license?ref=readme-vmd2)
189189

190190
## Useful Links

‎package.json‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-material-dashboard-2",
3-
"version": "3.0.0",
3+
"version": "3.1.0",
44
"private": true,
55
"author": "Creative Tim",
66
"license": "SEE LICENSE IN <https://www.creative-tim.com/license>",
@@ -19,27 +19,30 @@
1919
"lint": "vue-cli-service lint"
2020
},
2121
"dependencies": {
22-
"@popperjs/core": "2.10.2",
23-
"bootstrap": "5.1.3",
24-
"chart.js": "3.6.0",
25-
"core-js": "3.6.5",
26-
"vue": "3.2.0",
27-
"vue-router": "4.0.14",
28-
"vuex": "4.0.2"
22+
"@popperjs/core": "2.11.8",
23+
"bootstrap": "5.3.2",
24+
"chart.js": "4.4.0",
25+
"core-js": "3.33.0",
26+
"vue": "3.3.4",
27+
"vue-router": "4.2.5",
28+
"vuex": "4.1.0"
2929
},
3030
"devDependencies": {
31-
"@vue/cli-plugin-babel": "~4.5.0",
32-
"@vue/cli-plugin-eslint": "~4.5.0",
33-
"@vue/cli-plugin-router": "~4.5.0",
34-
"@vue/cli-service": "~4.5.0",
35-
"@vue/compiler-sfc": "3.2.0",
36-
"@vue/eslint-config-prettier": "6.0.0",
37-
"babel-eslint": "10.1.0",
38-
"eslint": "6.7.2",
39-
"eslint-plugin-prettier": "3.3.1",
40-
"eslint-plugin-vue": "7.0.0",
41-
"prettier": "2.2.1",
42-
"sass": "1.43.3",
43-
"sass-loader": "10.1.1"
31+
"@vue/cli-plugin-babel": "~5.0.8",
32+
"@vue/cli-plugin-eslint": "~5.0.8",
33+
"@vue/cli-plugin-router": "~5.0.8",
34+
"@vue/cli-service": "~5.0.8",
35+
"@vue/compiler-sfc": "3.3.4",
36+
"@vue/eslint-config-prettier": "8.0.0",
37+
"@babel/eslint-parser": "7.22.15",
38+
"eslint": "8.51.0",
39+
"eslint-plugin-prettier": "5.0.1",
40+
"eslint-plugin-vue": "9.17.0",
41+
"prettier": "3.0.3",
42+
"sass": "1.69.3",
43+
"sass-loader": "13.3.2"
44+
},
45+
"overrides": {
46+
"consolidate": "1.0.1"
4447
}
4548
}

‎public/index.html‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<!--
22
=========================================================
3-
* Vue Material Dashboard 2 - v3.0.0
3+
* Vue Material Dashboard 2 - v3.1.0
44
=========================================================
55
66
* Product Page: https://creative-tim.com/product/vue-material-dashboard-2
7-
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
1111
=========================================================
1212
1313
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
1414
-->
15-
<!DOCTYPE html>
15+
<!doctype html>
1616
<html lang="">
1717
<head>
1818
<meta charset="utf-8" />
@@ -41,10 +41,14 @@
4141
rel="stylesheet"
4242
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css"
4343
/>
44-
44+
4545
<!-- Nepcha Analytics (nepcha.com) -->
4646
<!-- Nepcha is a easy-to-use web analytics. No cookies and fully compliant with GDPR, CCPA and PECR. -->
47-
<script defer data-site="YOUR_DOMAIN_HERE" src="https://api.nepcha.com/js/nepcha-analytics.js"></script>
47+
<script
48+
defer
49+
data-site="YOUR_DOMAIN_HERE"
50+
src="https://api.nepcha.com/js/nepcha-analytics.js"
51+
></script>
4852
</head>
4953
<body class="bg-gray-200">
5054
<noscript>

‎src/App.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!--
22
=========================================================
3-
* Vue Material Dashboard 2 - v3.0.0
3+
* Vue Material Dashboard 2 - v3.1.0
44
=========================================================
55
66
* Product Page: https://creative-tim.com/product/vue-material-dashboard-2
7-
* Copyright 2022 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
@@ -49,10 +49,10 @@ export default {
4949
Sidenav,
5050
Configurator,
5151
Navbar,
52-
AppFooter
52+
AppFooter,
5353
},
5454
methods: {
55-
...mapMutations(["toggleConfigurator", "navbarMinimize"])
55+
...mapMutations(["toggleConfigurator", "navbarMinimize"]),
5656
},
5757
computed: {
5858
...mapState([
@@ -66,8 +66,8 @@ export default {
6666
"showNavbar",
6767
"showFooter",
6868
"showConfig",
69-
"hideConfigButton"
70-
])
69+
"hideConfigButton",
70+
]),
7171
},
7272
beforeMount() {
7373
this.$store.state.isTransparent = "bg-transparent";
@@ -77,6 +77,6 @@ export default {
7777
if (window.innerWidth > 1200) {
7878
sidenav.classList.add("g-sidenav-pinned");
7979
}
80-
}
80+
},
8181
};
8282
</script>

‎src/assets/scss/material-dashboard/_avatars.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333

3434
&.avatar-raised {
35-
margin-top: -($avatar-height / 2);
35+
margin-top: -calc($avatar-height / 2);
3636
}
3737

3838
&.avatar-scale-up:hover {
@@ -56,7 +56,7 @@
5656
height: $avatar-xxl-height !important;
5757

5858
&.avatar-raised {
59-
margin-top: -($avatar-xxl-height / 2);
59+
margin-top: -calc($avatar-xxl-height / 2);
6060
}
6161
}
6262

@@ -65,7 +65,7 @@
6565
height: $avatar-xl-height !important;
6666

6767
&.avatar-raised {
68-
margin-top: -($avatar-xl-height / 2);
68+
margin-top: -calc($avatar-xl-height / 2);
6969
}
7070
}
7171

@@ -75,7 +75,7 @@
7575
font-size: $font-size-sm;
7676

7777
&.avatar-raised {
78-
margin-top: -($avatar-lg-height / 2);
78+
margin-top: -calc($avatar-lg-height / 2);
7979
}
8080
}
8181

@@ -85,7 +85,7 @@
8585
font-size: $font-size-sm;
8686

8787
&.avatar-raised {
88-
margin-top: -($avatar-sm-height / 2);
88+
margin-top: -calc($avatar-sm-height / 2);
8989
}
9090
}
9191

@@ -95,7 +95,7 @@
9595
font-size: $font-size-xs;
9696

9797
&.avatar-raised {
98-
margin-top: -($avatar-xs-height / 2);
98+
margin-top: -calc($avatar-xs-height / 2);
9999
}
100100
}
101101

‎src/assets/scss/material-dashboard/_navbar-vertical.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
border: none;
2929

3030
.dropdown-menu {
31-
margin-left: $dropdown-item-padding-x / 2;
31+
margin-left: calc($dropdown-item-padding-x / 2);
3232
}
3333
}
3434
.avatar {

‎src/assets/scss/material-dashboard/_navbar.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
.navbar {
135135
&.navbar-transparent {
136136
.navbar-collapse {
137-
padding-top: $spacer / 2;
138-
padding-bottom: $spacer / 2;
137+
padding-top: calc($spacer / 2);
138+
padding-bottom: calc($spacer / 2);
139139
box-shadow: $box-shadow-lg;
140140
}
141141

0 commit comments

Comments
 (0)