Skip to content

Commit bfa306d

Browse files
skydiverskydiver
authored
Merge pull request #7 from skydiver/BETA
Merge BETA branch
2 parents 7d36cab + 7754e92 commit bfa306d

20 files changed

+11806
-9912
lines changed

‎README.md

+10-7
Original file line numberDiff line numberDiff line change
@@ -54,26 +54,29 @@ There are differents methods to include Materialize CSS assets:
5454
{!! MaterializeCSS::include_full() !!}
5555
```
5656
```html
57-
<link rel="stylesheet" href="http://yourdomain.com/materialize-css/css/materialize.min.css">
58-
<script src="//code.jquery.com/jquery-2.1.1.min.js"></script>
59-
<script src="http://yourdomain.com/materialize-css/js/materialize.min.js"></script>
57+
<link rel="stylesheet" charset="utf-8" href="https://fonts.googleapis.com/icon?family=Material+Icons">
58+
<link rel="stylesheet" charset="utf-8" href="http://yourdomain.com/materialize-css/css/materialize.min.css">
59+
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
60+
<script type="text/javascript" src="http://yourdomain.com/materialize-css/js/materialize.min.js"></script>
6061
```
6162

6263
* **include_all()**
6364
```php
6465
{!! MaterializeCSS::include_all() !!}
6566
```
6667
```html
67-
<link rel="stylesheet" href="http://yourdomain.com/materialize-css/css/materialize.min.css">
68-
<script src="http://yourdomain.com/materialize-css/js/materialize.min.js"></script>
68+
<link rel="stylesheet" charset="utf-8" href="https://fonts.googleapis.com/icon?family=Material+Icons">
69+
<link rel="stylesheet" charset="utf-8" href="http://yourdomain.com/materialize-css/css/materialize.min.css">
70+
<script type="text/javascript" src="http://yourdomain.com/materialize-css/js/materialize.min.js"></script>
6971
```
7072

7173
* **include_css()**
7274
```php
7375
{!! MaterializeCSS::include_css() !!}
7476
```
7577
```html
76-
<link rel="stylesheet" href="http://yourdomain.com/materialize-css/css/materialize.min.css">
78+
<link rel="stylesheet" charset="utf-8" href="https://fonts.googleapis.com/icon?family=Material+Icons">
79+
<link rel="stylesheet" charset="utf-8" href="http://yourdomain.com/materialize-css/css/materialize.min.css">
7780
```
7881

7982
* **include_js()**
@@ -97,7 +100,7 @@ There are differents methods to include Materialize CSS assets:
97100
{!! MaterializeCSS::include_secure_js() !!}
98101
```
99102
```html
100-
<script src="https://yourdomain.com/materialize-css/js/materialize.min.js"></script>
103+
<script type="text/javascript" src="http://yourdomain.com/materialize-css/js/materialize.min.js"></script>
101104
```
102105

103106
* **get_url_css($full=false, $secure=false)**

‎assets/LICENSE

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
The MIT License (MIT)
2-
3-
Copyright (c) 2014-2017 Materialize
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.
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2014-2018 Materialize
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/README.md

+90-90
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
1-
<p align="center">
2-
<a href="http://materializecss.com/">
3-
<img src="http://materializecss.com/res/materialize.svg" width="150">
4-
</a>
5-
6-
<h3 align="center">MaterializeCSS</h3>
7-
8-
<p align="center">
9-
Materialize, a CSS Framework based on material design.
10-
<br>
11-
<a href="http://materializecss.com/"><strong>-- Browse the docs --</strong></a>
12-
<br>
13-
<br>
14-
<a href="https://travis-ci.org/Dogfalo/materialize">
15-
<img src="https://travis-ci.org/Dogfalo/materialize.svg?branch=master" alt="Travis CI badge">
16-
</a>
17-
<a href="https://badge.fury.io/js/materialize-css">
18-
<img src="https://badge.fury.io/js/materialize-css.svg" alt="npm version badge">
19-
</a>
20-
<a href="https://cdnjs.com/libraries/materialize">
21-
<img src="https://img.shields.io/cdnjs/v/materialize.svg" alt="CDNJS version badge">
22-
</a>
23-
<a href="https://david-dm.org/Dogfalo/materialize">
24-
<img src="https://david-dm.org/Dogfalo/materialize/status.svg" alt="dependencies Status badge">
25-
</a>
26-
<a href="https://david-dm.org/Dogfalo/materialize#info=devDependencies">
27-
<img src="https://david-dm.org/Dogfalo/materialize/dev-status.svg" alt="devDependency Status badge">
28-
</a>
29-
<a href="https://gitter.im/Dogfalo/materialize">
30-
<img src="https://badges.gitter.im/Join%20Chat.svg" alt="Gitter badge">
31-
</a>
32-
</p>
33-
34-
## Table of Contents
35-
- [Quickstart](#quickstart)
36-
- [Documentation](#documentation)
37-
- [Supported Browsers](#supported-browsers)
38-
- [Changelog](#changelog)
39-
- [Testing](#testing)
40-
- [Contributing](#contributing)
41-
- [Copyright and license](#copyright-and-license)
42-
43-
## Quickstart:
44-
Read the [getting started guide](http://materializecss.com/getting-started.html) for more information on how to use materialize.
45-
46-
- [Download the latest release](https://github.com/Dogfalo/materialize/releases/latest) of materialize directly from GitHub.
47-
- Clone the repo: `git clone https://github.com/Dogfalo/materialize.git`
48-
- Include the files via [cdnjs](https://cdnjs.com/libraries/materialize). More [here](http://materializecss.com/getting-started.html).
49-
- Install with [npm](https://www.npmjs.com): `npm install materialize-css`
50-
- Install with [Bower](https://bower.io): `bower install materialize`
51-
- Install with [Atmosphere](https://atmospherejs.com): `meteor add materialize:materialize`
52-
53-
## Documentation
54-
The documentation can be found at <http://materializecss.com>. To run the documentation locally on your machine, you need [Node.js](https://nodejs.org/en/) installed on your computer.
55-
56-
### Running documentation locally
57-
Run these commands to set up the documentation:
58-
59-
```bash
60-
git clone https://github.com/Dogfalo/materialize
61-
cd materialize
62-
npm install
63-
```
64-
65-
Then run `grunt monitor` to compile the documentation. When it finishes, open a new browser window and navigate to `localhost:8000`. We use [BrowserSync](https://www.browsersync.io/) to display the documentation.
66-
67-
### Documentation for previous releases
68-
Previous releases and their documentation are available for [download](https://github.com/Dogfalo/materialize/releases).
69-
70-
## Supported Browsers:
71-
Materialize is compatible with:
72-
73-
- Chrome 35+
74-
- Firefox 31+
75-
- Safari 7+
76-
- Opera
77-
- Edge
78-
- IE 10+
79-
80-
## Changelog
81-
For changelogs, check out [the Releases section of materialize](https://github.com/Dogfalo/materialize/releases) or the [CHANGELOG.md](CHANGELOG.md).
82-
83-
## Testing
84-
We use Jasmine as our testing framework and we're trying to write a robust test suite for our components. If you want to help, [here's a starting guide on how to write tests in Jasmine](CONTRIBUTING.md#jasmine-testing-guide).
85-
86-
## Contributing
87-
Check out the [CONTRIBUTING document](CONTRIBUTING.md) in the root of the repository to learn how you can contribute. You can also browse the [help-wanted](https://github.com/Dogfalo/materialize/labels/help-wanted) tag in our issue tracker to find things to do.
88-
89-
## Copyright and license
90-
Code copyright 2017 Materialize. Code released under the MIT license.
1+
<p align="center">
2+
<a href="http://materializecss.com/">
3+
<img src="http://materializecss.com/res/materialize.svg" width="150">
4+
</a>
5+
6+
<h3 align="center">MaterializeCSS</h3>
7+
8+
<p align="center">
9+
Materialize, a CSS Framework based on material design.
10+
<br>
11+
<a href="http://materializecss.com/"><strong>-- Browse the docs --</strong></a>
12+
<br>
13+
<br>
14+
<a href="https://travis-ci.org/Dogfalo/materialize">
15+
<img src="https://travis-ci.org/Dogfalo/materialize.svg?branch=master" alt="Travis CI badge">
16+
</a>
17+
<a href="https://badge.fury.io/js/materialize-css">
18+
<img src="https://badge.fury.io/js/materialize-css.svg" alt="npm version badge">
19+
</a>
20+
<a href="https://cdnjs.com/libraries/materialize">
21+
<img src="https://img.shields.io/cdnjs/v/materialize.svg" alt="CDNJS version badge">
22+
</a>
23+
<a href="https://david-dm.org/Dogfalo/materialize">
24+
<img src="https://david-dm.org/Dogfalo/materialize/status.svg" alt="dependencies Status badge">
25+
</a>
26+
<a href="https://david-dm.org/Dogfalo/materialize#info=devDependencies">
27+
<img src="https://david-dm.org/Dogfalo/materialize/dev-status.svg" alt="devDependency Status badge">
28+
</a>
29+
<a href="https://gitter.im/Dogfalo/materialize">
30+
<img src="https://badges.gitter.im/Join%20Chat.svg" alt="Gitter badge">
31+
</a>
32+
</p>
33+
34+
## Table of Contents
35+
- [Quickstart](#quickstart)
36+
- [Documentation](#documentation)
37+
- [Supported Browsers](#supported-browsers)
38+
- [Changelog](#changelog)
39+
- [Testing](#testing)
40+
- [Contributing](#contributing)
41+
- [Copyright and license](#copyright-and-license)
42+
43+
## Quickstart:
44+
Read the [getting started guide](http://materializecss.com/getting-started.html) for more information on how to use materialize.
45+
46+
- [Download the latest release](https://github.com/Dogfalo/materialize/releases/latest) of materialize directly from GitHub.
47+
- Clone the repo: `git clone https://github.com/Dogfalo/materialize.git`
48+
- Include the files via [cdnjs](https://cdnjs.com/libraries/materialize). More [here](http://materializecss.com/getting-started.html).
49+
- Install with [npm](https://www.npmjs.com): `npm install materialize-css`
50+
- Install with [Bower](https://bower.io): `bower install materialize` ([DEPRECATED](https://bower.io/blog/2017/how-to-migrate-away-from-bower/))
51+
- Install with [Atmosphere](https://atmospherejs.com): `meteor add materialize:materialize`
52+
53+
## Documentation
54+
The documentation can be found at <http://materializecss.com>. To run the documentation locally on your machine, you need [Node.js](https://nodejs.org/en/) installed on your computer.
55+
56+
### Running documentation locally
57+
Run these commands to set up the documentation:
58+
59+
```bash
60+
git clone https://github.com/Dogfalo/materialize
61+
cd materialize
62+
npm install
63+
```
64+
65+
Then run `grunt monitor` to compile the documentation. When it finishes, open a new browser window and navigate to `localhost:8000`. We use [BrowserSync](https://www.browsersync.io/) to display the documentation.
66+
67+
### Documentation for previous releases
68+
Previous releases and their documentation are available for [download](https://github.com/Dogfalo/materialize/releases).
69+
70+
## Supported Browsers:
71+
Materialize is compatible with:
72+
73+
- Chrome 35+
74+
- Firefox 31+
75+
- Safari 9+
76+
- Opera
77+
- Edge
78+
- IE 11+
79+
80+
## Changelog
81+
For changelogs, check out [the Releases section of materialize](https://github.com/Dogfalo/materialize/releases) or the [CHANGELOG.md](CHANGELOG.md).
82+
83+
## Testing
84+
We use Jasmine as our testing framework and we're trying to write a robust test suite for our components. If you want to help, [here's a starting guide on how to write tests in Jasmine](CONTRIBUTING.md#jasmine-testing-guide).
85+
86+
## Contributing
87+
Check out the [CONTRIBUTING document](CONTRIBUTING.md) in the root of the repository to learn how you can contribute. You can also browse the [help-wanted](https://github.com/Dogfalo/materialize/labels/help-wanted) tag in our issue tracker to find things to do.
88+
89+
## Copyright and license
90+
Code copyright 2017 Materialize. Code released under the MIT license.

0 commit comments

Comments
 (0)