Skip to content

Commit 0ef1cbf

Browse files
conacelelenaconacelelena
committed
Merge branch 'master' into githubMaster
# Conflicts: # assets/css/material-dashboard.css # assets/js/material-dashboard.js # assets/sass/material-dashboard.scss
2 parents af9867d + 5b82007 commit 0ef1cbf

File tree

6 files changed

+56
-100
lines changed

6 files changed

+56
-100
lines changed

‎License.pdf

-74 KB
Binary file not shown.

‎README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ material-dashboard/
6060
|
6161
├── documentation/
6262
├── examples/
63-
└── License.pdf
6463
6564
```
6665

@@ -72,6 +71,13 @@ V1.1.0 10 Nov, 2016 - New Page Added
7271
- fix link in documentation
7372
- for those who want to upsell inside their dashboard we added a new page "Upgrade to PRO" with a pricing and options table
7473

74+
V1.1.1 8 Feb 2017
75+
- switched to MIT License
76+
77+
### License
78+
79+
- Copyright 2017 Creative Tim (http://www.creative-tim.com)
80+
- Licensed under MIT (https://github.com/creativetimofficial/material-dashboard/blob/master/LICENSE.md)
7581

7682
## Useful Links
7783

‎assets/css/material-dashboard.css

+16-32
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,19 @@
1-
/*! =========================================================
2-
*
3-
Material Dashboard - V1.1.0
4-
*
5-
* =========================================================
6-
*
7-
* Copyright 2016 Creative Tim (http://www.creative-tim.com/product/material-dashboard)
8-
*
9-
* _oo0oo_
10-
* o8888888o
11-
* 88" . "88
12-
* (| -_- |)
13-
* 0\ = /0
14-
* ___/`---'\___
15-
* .' \| |// '.
16-
* / \||| : |||// \
17-
* / _||||| -:- |||||- \
18-
* | | \ - /// | |
19-
* | \_| ''\---/'' |_/ |
20-
* \ .-\__ '-' ___/-. /
21-
* ___'. .' /--.--\ `. .'___
22-
* ."" '< `.___\_<|>_/___.' >' "".
23-
* | | : `- \`.;`\ _ /`;.`/ - ` : | |
24-
* \ \ `_. \_ __\ /__ _/ .-` / /
25-
* =====`-.____`.___ \_____/___.-`___.-'=====
26-
* `=---='
27-
*
28-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
29-
*
30-
* Buddha Bless: "No Bugs"
31-
*
32-
* ========================================================= */
1+
/*!
2+
3+
=========================================================
4+
* Material Dashboard - v1.1.1
5+
=========================================================
6+
7+
* Product Page: http://www.creative-tim.com/product/material-dashboard
8+
* Copyright 2017 Creative Tim (http://www.creative-tim.com)
9+
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard/blob/master/LICENSE.md)
10+
11+
=========================================================
12+
13+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
14+
15+
*/
16+
3317
/* ANIMATION */
3418
/* SHADOWS */
3519
/* Shadows (from mdl http://www.getmdl.io/) */

‎assets/js/material-dashboard.js

+15-33
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,18 @@
1-
/*! =========================================================
2-
*
3-
* Material Dashboard - V1.1.0
4-
*
5-
* =========================================================
6-
*
7-
* Copyright 2016 Creative Tim (http://www.creative-tim.com/product/material-dashboard)
8-
*
9-
*
10-
* _oo0oo_
11-
* o8888888o
12-
* 88" . "88
13-
* (| -_- |)
14-
* 0\ = /0
15-
* ___/`---'\___
16-
* .' \| |// '.
17-
* / \||| : |||// \
18-
* / _||||| -:- |||||- \
19-
* | | \\ - /// | |
20-
* | \_| ''\---/'' |_/ |
21-
* \ .-\__ '-' ___/-. /
22-
* ___'. .' /--.--\ `. .'___
23-
* ."" '< `.___\_<|>_/___.' >' "".
24-
* | | : `- \`.;`\ _ /`;.`/ - ` : | |
25-
* \ \ `_. \_ __\ /__ _/ .-` / /
26-
* =====`-.____`.___ \_____/___.-`___.-'=====
27-
* `=---='
28-
*
29-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
30-
*
31-
* Buddha Bless: "No Bugs"
32-
*
33-
* ========================================================= */
1+
/*!
2+
3+
=========================================================
4+
* Material Dashboard - v1.1.1
5+
=========================================================
6+
7+
* Product Page: http://www.creative-tim.com/product/material-dashboard
8+
* Copyright 2017 Creative Tim (http://www.creative-tim.com)
9+
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard/blob/master/LICENSE.md)
10+
11+
=========================================================
12+
13+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
14+
15+
*/
3416

3517
// Material Dashboard Wizard Functions
3618

‎assets/sass/material-dashboard.scss

+15-34
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,18 @@
1-
/*! =========================================================
2-
*
3-
Material Dashboard - V1.1.0
4-
*
5-
* =========================================================
6-
*
7-
* Copyright 2016 Creative Tim (http://www.creative-tim.com/product/material-dashboard)
8-
*
9-
* _oo0oo_
10-
* o8888888o
11-
* 88" . "88
12-
* (| -_- |)
13-
* 0\ = /0
14-
* ___/`---'\___
15-
* .' \| |// '.
16-
* / \||| : |||// \
17-
* / _||||| -:- |||||- \
18-
* | | \\ - /// | |
19-
* | \_| ''\---/'' |_/ |
20-
* \ .-\__ '-' ___/-. /
21-
* ___'. .' /--.--\ `. .'___
22-
* ."" '< `.___\_<|>_/___.' >' "".
23-
* | | : `- \`.;`\ _ /`;.`/ - ` : | |
24-
* \ \ `_. \_ __\ /__ _/ .-` / /
25-
* =====`-.____`.___ \_____/___.-`___.-'=====
26-
* `=---='
27-
*
28-
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
29-
*
30-
* Buddha Bless: "No Bugs"
31-
*
32-
* ========================================================= */
33-
34-
1+
/*!
2+
3+
=========================================================
4+
* Material Dashboard - v1.1.1
5+
=========================================================
6+
7+
* Product Page: http://www.creative-tim.com/product/material-dashboard
8+
* Copyright 2017 Creative Tim (http://www.creative-tim.com)
9+
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard/blob/master/LICENSE.md)
10+
11+
=========================================================
12+
13+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
14+
15+
*/
3516

3617

3718
//variables and mixins

‎changelog - v1.1.0.txt renamed to ‎changelog - v1.1.1.txt

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ V1.0.0 21 Sept, 2016 - Initial Release
33
V1.1.0 10 Nov, 2016 - New Page Added
44
- fix link in documentation
55
- for those who want to upsell inside their dashboard we added a new page "Upgrade to PRO" with a pricing and options table
6+
7+
V1.1.1 8 Feb 2017
8+
- switched to MIT License

0 commit comments

Comments
 (0)