Skip to content

Commit 1beffcc

Browse files
einazareeinazare
authored
Merge pull request #79 from creativetimofficial/feature/update-to-v1.9.0
Feature: update to v1.9.0
2 parents 353cd4d + 6ba9ce5 commit 1beffcc

File tree

14 files changed

+294
-50
lines changed

14 files changed

+294
-50
lines changed

‎CHANGELOG.md‎

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

3+
## [1.9.0] date
4+
### Bug fixing
5+
- https://github.com/creativetimofficial/material-kit-react/issues/67
6+
### Major style changes
7+
### Deleted components
8+
### Added components
9+
### Deleted dependencies
10+
### Added dependencies
11+
### Updated dependencies
12+
```
13+
@material-ui/core 4.3.2 → 4.10.0
14+
@material-ui/icons 4.2.1 → 4.9.1
15+
history 4.9.0 → 4.10.1
16+
moment 2.24.0 → 2.26.0
17+
node-sass 4.12.0 → 4.14.1
18+
nouislider 14.0.2 → 14.5.0
19+
react 16.9.0 → 16.13.1
20+
react-dom 16.9.0 → 16.13.1
21+
react-router-dom 5.0.1 → 5.2.0
22+
react-scripts 3.1.0 → 3.4.1
23+
react-slick 0.25.2 → 0.26.1
24+
react-swipeable-views 0.13.3 → 0.13.9
25+
@babel/cli 7.5.5 → 7.10.1
26+
@babel/plugin-proposal-class-properties 7.5.5 → 7.10.1
27+
@babel/preset-env 7.5.5 → 7.10.1
28+
@babel/preset-react 7.0.0 → 7.10.1
29+
eslint-config-prettier 6.0.0 → 6.11.0
30+
eslint-plugin-prettier 3.1.0 → 3.1.3
31+
eslint-plugin-react 7.14.3 → 7.20.0
32+
prettier 1.18.2 → 2.0.5
33+
typescript 3.5.3 → 3.9.3
34+
```
35+
### Warning
36+
_While in development some of the plugins that were used for this product will throw some warnings - note, this only happens in development, the UI or the functionality of the product is not affected, also, if the issues will persist in React 17, we'll drop usage of those plugins, and replace them with other ones._
37+
_Warnings might appear while doing an npm install - they do not affect the UI or the functionality of the product, and they appear because of NodeJS and not from the product itself._
38+
339
## [1.8.0] 2019.08.26
440
### Bug fixing
541
- Rewrote the ISSUE_TEMPLATE

‎Documentation/assets/css/material-dashboard.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Material Dashboard React - v1.8.0
4+
* Material Dashboard React - v1.9.0
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
8-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
1010
1111
=========================================================

‎Documentation/tutorial-components.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
/>
2727
<!-- CSS Files -->
2828
<link href="assets/css/bootstrap.min.css" rel="stylesheet" />
29-
<link href="assets/css/material-dashboard.css" rel="stylesheet" />
30-
<link href="assets/css/demo-documentation.css" rel="stylesheet" />
29+
<link href="assets/css/material-dashboard.css?v=1.9.0" rel="stylesheet" />
30+
<link href="assets/css/demo-documentation.css?v=1.9.0" rel="stylesheet" />
3131
<style media="screen">
3232
.page-header {
3333
height: 100vh;
@@ -97,7 +97,7 @@
9797
<div class="col-md-8 col-md-offset-2 text-center">
9898
<h1 class="title ">Material Kit React</h1>
9999
<h4 class="title">Tutorial and Components</h4>
100-
<h5 class="description">v1.8.0</h5>
100+
<h5 class="description">v1.9.0</h5>
101101
<a
102102
href="https://creativetimofficial.github.io/material-kit-react/#/documentation/tutorial"
103103
class="btn btn-rose btn-fill btn-round"

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 Creative Tim
3+
Copyright (c) 2020 Creative Tim
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# [Material Kit React](https://demos.creative-tim.com/material-kit-react) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Material%20Kit%20PRO%20is%20a%20Bootstrap%20UI%20Kit%20with%20a%20fresh,%20new%20design%20inspired%20by%20Google's%20Material%20Design%20%E2%9D%A4%EF%B8%8Fhttps%3A//demos.creative-tim.com/material-kit-pro/presentation.html%20%23bootstrap%20%23material%20%23design%20%23uikit%20%23premium%20%20via%20%40CreativeTim)
22

33

4-
![version](https://img.shields.io/badge/version-1.8.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-kit-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-kit-react/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
4+
![version](https://img.shields.io/badge/version-1.9.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-kit-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-kit-react/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
55

66

77
![Product Presentation Image](https://s3.amazonaws.com/creativetim_bucket/products/83/original/opt_mk_react_thumbnail.jpg)
@@ -230,7 +230,7 @@ We use GitHub Issues as the official bug tracker for the Material Kit. Here are
230230

231231
## Licensing
232232

233-
- Copyright 2019 Creative Tim (https://www.creative-tim.com/)
233+
- Copyright 2020 Creative Tim (https://www.creative-tim.com/)
234234

235235
- Licensed under MIT (https://github.com/creativetimofficial/material-kit/blob/master/LICENSE.md)
236236

‎gulpfile.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ gulp.task("licenses", async function() {
1313
=========================================================
1414
1515
* Product Page: https://www.creative-tim.com/product/now-ui-kit-pro-react
16-
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
16+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
1717
1818
* Coded by Creative Tim
1919
@@ -36,7 +36,7 @@ gulp.task("licenses", async function() {
3636
=========================================================
3737
3838
* Product Page: https://www.creative-tim.com/product/now-ui-kit-pro-react
39-
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
39+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
4040
4141
* Coded by Creative Tim
4242
@@ -59,7 +59,7 @@ gulp.task("licenses", async function() {
5959
=========================================================
6060
6161
* Product Page: https://www.creative-tim.com/product/now-ui-kit-pro-react
62-
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
62+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
6363
6464
* Coded by Creative Tim
6565

‎package.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
{
22
"name": "material-kit-react",
3-
"version": "1.8.0",
3+
"version": "1.9.0",
44
"description": "Material Kit React. Coded by Creative Tim",
55
"private": true,
6-
"main": "dist/index.js",
6+
"main": "src/index.js",
77
"dependencies": {
8-
"@material-ui/core": "4.3.2",
9-
"@material-ui/icons": "4.2.1",
8+
"@material-ui/core": "4.10.0",
9+
"@material-ui/icons": "4.9.1",
1010
"classnames": "2.2.6",
11-
"history": "4.9.0",
12-
"moment": "2.24.0",
13-
"node-sass": "4.12.0",
14-
"nouislider": "14.0.2",
11+
"history": "4.10.1",
12+
"moment": "2.26.0",
13+
"node-sass": "4.14.1",
14+
"nouislider": "14.5.0",
1515
"prop-types": "15.7.2",
16-
"react": "16.9.0",
16+
"react": "16.13.1",
1717
"react-datetime": "2.16.3",
18-
"react-dom": "16.9.0",
19-
"react-router-dom": "5.0.1",
20-
"react-scripts": "3.1.0",
21-
"react-slick": "0.25.2",
22-
"react-swipeable-views": "0.13.3"
18+
"react-dom": "16.13.1",
19+
"react-router-dom": "5.2.0",
20+
"react-scripts": "3.4.1",
21+
"react-slick": "0.26.1",
22+
"react-swipeable-views": "0.13.9"
2323
},
2424
"devDependencies": {
25-
"@babel/cli": "7.5.5",
26-
"@babel/plugin-proposal-class-properties": "7.5.5",
27-
"@babel/preset-env": "7.5.5",
28-
"@babel/preset-react": "7.0.0",
29-
"eslint-config-prettier": "6.0.0",
30-
"eslint-plugin-prettier": "3.1.0",
31-
"eslint-plugin-react": "7.14.3",
25+
"@babel/cli": "7.10.1",
26+
"@babel/plugin-proposal-class-properties": "7.10.1",
27+
"@babel/preset-env": "7.10.1",
28+
"@babel/preset-react": "7.10.1",
29+
"eslint-config-prettier": "6.11.0",
30+
"eslint-plugin-prettier": "3.1.3",
31+
"eslint-plugin-react": "7.20.0",
3232
"gulp": "4.0.2",
3333
"gulp-append-prepend": "1.0.8",
34-
"prettier": "1.18.2"
34+
"prettier": "2.0.5"
3535
},
3636
"optionalDependencies": {
37-
"typescript": "3.5.3"
37+
"typescript": "3.9.3"
3838
},
3939
"scripts": {
4040
"start": "react-scripts start",

‎src/assets/css/material-kit-react.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/assets/jss/material-kit-react.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Material Kit React - v1.8.0 based on Material Kit - v2.0.2
4+
* Material Kit React - v1.9.0 based on Material Kit - v2.0.2
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/material-kit-react
8-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/material-kit-react/blob/master/LICENSE.md)
1010
1111
=========================================================
@@ -24,15 +24,15 @@ const transition = {
2424
transition: "all 0.33s cubic-bezier(0.685, 0.0473, 0.346, 1)"
2525
};
2626

27-
const conatinerFluid = {
27+
const containerFluid = {
2828
paddingRight: "15px",
2929
paddingLeft: "15px",
3030
marginRight: "auto",
3131
marginLeft: "auto",
3232
width: "100%"
3333
};
3434
const container = {
35-
...conatinerFluid,
35+
...containerFluid,
3636
"@media (min-width: 576px)": {
3737
maxWidth: "540px"
3838
},
@@ -184,7 +184,7 @@ export {
184184
drawerWidth,
185185
transition,
186186
container,
187-
conatinerFluid,
187+
containerFluid,
188188
boxShadow,
189189
card,
190190
defaultFont,

‎src/assets/jss/material-kit-react/views/componentsSections/exampleStyle.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { conatinerFluid } from "assets/jss/material-kit-react.js";
1+
import { containerFluid } from "assets/jss/material-kit-react.js";
22

33
import imagesStyle from "assets/jss/material-kit-react/imagesStyles.js";
44

@@ -7,7 +7,7 @@ const exampleStyle = {
77
padding: "70px 0"
88
},
99
container: {
10-
...conatinerFluid,
10+
...containerFluid,
1111
textAlign: "center !important"
1212
},
1313
...imagesStyle,

0 commit comments

Comments
 (0)