Skip to content

Commit d717737

Browse files
chelarucipchelarucip
committed
* 'master' of https://github.com/creativetimofficial/material-dashboard-angular: added copyright MIT in css and JS removed Buddha Bless code small changes in documentation + added LICENSE.md
2 parents d57ffdd + c926217 commit d717737

File tree

9 files changed

+126
-119
lines changed

9 files changed

+126
-119
lines changed

‎LICENSE.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2017 Creative Tim (www.creative-tim.com)
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎assets/css/material-dashboard.css‎

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +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-
* ========================================================= */
1+
/*!
2+
3+
=========================================================
4+
* Material Dashboard Angular 2 - V1.1.0.0
5+
=========================================================
6+
7+
* Product Page: https://www.creative-tim.com/product/material-dashboard-angular2
8+
* Copyright 2017 Creative Tim (https://www.creative-tim.com)
9+
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-angular/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+
*/
3316
/* ANIMATION */
3417
/* SHADOWS */
3518
/* Shadows (from mdl http://www.getmdl.io/) */
@@ -5523,5 +5506,3 @@ footer .btn {
55235506
margin-right: -20px;
55245507
}
55255508
}
5526-
5527-
/*# sourceMappingURL=material-dashboard.css.map */

‎assets/css/material-dashboard.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.

‎assets/js/material-dashboard-angular.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/*!
2+
3+
=========================================================
4+
* Material Dashboard Angular - V1.1.0.0
5+
=========================================================
6+
7+
* Product Page: https://www.creative-tim.com/product/material-dashboard-angular2
8+
* Copyright 2017 Creative Tim (https://www.creative-tim.com)
9+
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-angular/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+
17+
118
$(document).ready(function(){
219
$moving_tab = $('<div class="moving-tab"/>');
320
$('.sidebar .nav-container').append($moving_tab);

‎assets/js/material-dashboard.js‎

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +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-
* ========================================================= */
34-
35-
// Material Dashboard Wizard Functions
1+
/*!
362
3+
=========================================================
4+
* Material Dashboard Angular 2 - V1.1.0.0
5+
=========================================================
6+
7+
* Product Page: https://www.creative-tim.com/product/material-dashboard-angular2
8+
* Copyright 2017 Creative Tim (https://www.creative-tim.com)
9+
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-angular/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+
*/
3716

3817

3918
var searchVisible = 0;

‎assets/sass/material-dashboard.scss‎

Lines changed: 13 additions & 32 deletions
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-
* ========================================================= */
1+
/*!
332
3+
=========================================================
4+
* Material Dashboard Angular 2 - V1.1.0.0
5+
=========================================================
346
7+
* Product Page: https://www.creative-tim.com/product/material-dashboard-angular2
8+
* Copyright 2017 Creative Tim (https://www.creative-tim.com)
9+
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-angular/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

‎documentation/css/demo-documentation.css‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,14 +465,24 @@ body{
465465
.header-filter .container {
466466
z-index: 2;
467467
position: relative;
468-
padding-top: 20vh;
468+
padding-top: 130px;
469469
}
470470

471+
.page-header{
472+
height: 550px;
473+
}
471474
.page-header .title{
472475
font-weight: 700;
473476
font-family: "Roboto Slab", "Times New Roman", serif;
474477
line-height: 1.15em;
475478
color: #fff;
479+
font-size: 3.3em;
480+
}
481+
.page-header .sub-title{
482+
color: #fff;
483+
font-weight: 600;
484+
font-size: 20px;
485+
text-transform: uppercase;
476486
}
477487

478488
.section {

‎documentation/tutorial-components.html‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,13 @@ <h4>
120120
<div class="page-header header-filter" style="background-image: url('../assets/img/cover.jpeg');">
121121
<div class="container">
122122
<div class="row">
123-
<div class="col-md-8 col-md-offset-2">
123+
<div class="col-md-10 col-md-offset-1 text-center">
124124
<div class="image-header">
125125
<img src="../assets/img/angular2-logo.png">
126126
</div>
127-
<h1 class="title text-center">Tutorial and Components</h1>
127+
128+
<h1 class="title">Material Dashboard Angular 2</h1>
129+
<h3 class="sub-title">Tutorial and Components</h3>
128130
</div>
129131
</div>
130132
</div>
@@ -162,10 +164,28 @@ <h1 class="title text-center">Tutorial and Components</h1>
162164

163165
<!-- License Row -->
164166
<div class="tim-row tim-row-first" id="license">
165-
<h2 class="text-center">License</h2>
167+
<h2 class="text-center">MIT License</h2>
166168
<legend></legend>
167169
<p>
168-
Currently, on <a href="www.creative-tim.com" target="_blank">Creative Tim</a> you can get the products with two types of licenses: Personal or Developer. All the freebies are licensed to Personal License as default. If you are making a paid purchase, be sure to go through the table with the rights and the guidelines, so you can know what is the best fit for you. View the rights table and the description for each license on our <a target="_blank" href="http://www.creative-tim.com/license?ref=license-page-mk-free">Official License Page</a>.
170+
Copyright (c) 2017 <a href="https://www.creative-tim.com?ref=material-dashboard-angular" target="_blank">Creative Tim</a>
171+
<br><br>
172+
Permission is hereby granted, free of charge, to any person obtaining a copy
173+
of this software and associated documentation files (the "Software"), to deal
174+
in the Software without restriction, including without limitation the rights
175+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
176+
copies of the Software, and to permit persons to whom the Software is
177+
furnished to do so, subject to the following conditions:
178+
<br><br>
179+
The above copyright notice and this permission notice shall be included in all
180+
copies or substantial portions of the Software.
181+
<br><br>
182+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
183+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
184+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
185+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
186+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
187+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
188+
SOFTWARE.
169189
</p>
170190
</div>
171191

@@ -174,21 +194,18 @@ <h2 class="text-center">License</h2>
174194
<h2 class="text-center">Short Description and Usage</h2>
175195
<legend></legend>
176196
<p>
177-
<b>Material Dashboard</b> is a free Material Bootstrap Admin with a fresh, new design inspired by Google's Material Design. We are very excited to introduce our take on the material concepts through an easy to use and beautiful set of components. Material Dashboard was built over the popular Bootstrap framework and it comes with a couple of third-party plugins redesigned to fit in with the rest of the elements.
178-
</p>
179-
<p>
180-
Using it is very simple and it will enable you to refresh you classic looking application. To get the desired effect you will also need to integrate JS plugins that take a little bit more effort. It the end the result will be worth it.
197+
<b>Material Dashboard Angular 2</b> is a free Material Bootstrap Admin with a fresh, new design inspired by Google's Material Design. We are very excited to introduce our take on the material concepts through an easy to use and beautiful set of components. Material Dashboard Angular 2 was built over the popular Bootstrap framework and it comes with a couple of third-party plugins redesigned to fit in with the rest of the elements.
181198
</p>
182199
</div>
183200

184201
<div class="tim-row">
185202
<h2 class="text-center">Getting Started</h2>
186203
<legend></legend>
187204
<p>
188-
The <b>Material Dashboard</b> is built on top of Bootstrap 3, so you can safely use it on your existing or new Bootstrap project. No line of code from Bootstrap 3 was changed, so you don't have to worry about undesired effects in your work.
205+
The <b>Material Dashboard Angular 2</b> is built on top of Bootstrap 3, so you can safely use it on your existing or new Bootstrap project. No line of code from Bootstrap 3 was changed, so you don't have to worry about undesired effects in your work.
189206
</p>
190207
<p>
191-
The easiest way to start is to use our <a href="../examples/template.html" target="_blank">start-up template</a> where all the files are already included and ready to use.
208+
To jump start your project, you can use our start-up template where all the files are already included and ready to use. If you do however, want to start from scratch, you can see the file structure below. The core JavaScript is contained in "js/material-bootstrap-angular.js". Some functions are called from "js/demo.js" because they are presented only for demo purpose, you can check there how they are working and duplicate their effect on your projct. For the other files, you should add them if you use the specific element inside your page.
192209
</p>
193210
<ul>
194211
<li><p>Install NodeJs from <a href="https://nodejs.org/en" target="_blank">NodeJs Official Page</a></p></li>
@@ -213,6 +230,7 @@ <h2 class="text-left">File Structure</h2>
213230
<pre>
214231
material-dashboard-angular
215232
├── README.md
233+
├── LICENSE.md
216234
├── app
217235
│   ├── app.component.html
218236
│   ├── app.component.js
@@ -312,7 +330,7 @@ <h2 class="text-left">File Structure</h2>
312330
<h2 class="text-left">Restyled Components</h2>
313331
<legend></legend>
314332
<p>
315-
Here is the list of Bootstrap 3 components that were restyled in <b>Material Dashboard</b>:
333+
Here is the list of Bootstrap 3 components that were restyled in <b>Material Dashboard Angular 2</b>:
316334
<ul>
317335
<li> Buttons </li>
318336
<li> Inputs</li>
@@ -1593,10 +1611,10 @@ <h2 class="text-center">How to setup Google API Keys</h2>
15931611
<!-- Google Maps Plugin -->
15941612
<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js"></script>
15951613

1596-
<!-- Material Dashboard javascript methods -->
1614+
<!-- Material Dashboard Angular 2 javascript methods -->
15971615
<script src="../assets/js/material-dashboard.js"></script>
15981616

1599-
<!-- Material Dashboard DEMO methods, don't include it in your project! -->
1617+
<!-- Material Dashboard Angular 2 DEMO methods, don't include it in your project! -->
16001618
<script src="../assets/js/demo.js"></script>
16011619

16021620
<script type="text/javascript" src="../assets/js/initMenu.js"></script>

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "Angular2",
3-
"version": "1.0.0",
2+
"name": "Material Dashboard Angular2",
3+
"version": "1.1.0.0",
44
"scripts": {
55
"start": "tsc && concurrently \"tsc -w\" \"lite-server\" ",
66
"lite": "lite-server",
@@ -10,7 +10,7 @@
1010
"licenses": [
1111
{
1212
"type": "MIT",
13-
"url": "https://github.com/angular/angular.io/blob/master/LICENSE"
13+
"url": "https://github.com/creativetimofficial/material-dashboard-angular/blob/master/LICENSE.md"
1414
}
1515
],
1616
"dependencies": {

0 commit comments

Comments
 (0)