Skip to content

Commit bde6acc

Browse files
authored
Merge pull request #472 from materializecss/release-2.0.4
Release 2.0.4
2 parents 93e673c + c3435f0 commit bde6acc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+7018
-23814
lines changed

.commitlintrc

-3
This file was deleted.

.gitattributes

-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
* text=auto
22
**/*.html linguist-documentation
3-
js/velocity.min.js linguist-vendored
4-
js/jquery.easing.1.4.js linguist-vendored
5-
js/jquery.timeago.min.js linguist-vendored
6-
73

84
css/ghpages-materialize.css merge=ours
95
.gitignore merge=ours

.github/workflows/docs.yml

-49
This file was deleted.

.github/workflows/lint-commits.yml

-11
This file was deleted.

.husky/.gitignore

-1
This file was deleted.

.husky/commit-msg

-5
This file was deleted.

.prettierignore

-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
js/anime.min.js
2-
js/cash.js
3-
js/waves.js
4-
js/jquery.timeago.min.js
51
node_modules/
62
package.json
73
package.json.lock
84
bin/
95
dist/
10-
extras/
116
css/

CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ patches and features.
3636
Before you now get lost in the repository, here are a few starting points for you to check out. You might find that others have had similar questions or that your question rather belongs in one place than another.
3737

3838
* Chat: https://gitter.im/materializecss/materialize
39-
* Website: https://materializecss.github.io/materialize
39+
* Website: https://materializeweb.com
4040
* Github discussions: https://github.com/materializecss/materialize/discussions
4141

4242
## Using the issue tracker
@@ -169,7 +169,7 @@ If you want to help us translate the documentation into other languages, you can
169169

170170
After `npm install`, you can run `npm test` and it will run the tests. If you get any errors and have not made any changes, it means you have not installed the proper dependencies.
171171

172-
Materialize uses Jasmine as the testing framework. We also include a jQuery library which allows you to write tests using jQuery syntax.
172+
Materialize uses Jasmine as the testing framework.
173173

174174
### Starting Out
175175

@@ -199,7 +199,7 @@ expect(toast.length).toBe(0, 'because toast should be removed by now');
199199
```
200200
When this expect statement fails it will list the reason as “because toast should be removed by now”.
201201

202-
Because our components are very front end heavy, familiarize yourself with jQuery ways of interacting with the dom and our components. You can use methods like [trigger](http://api.jquery.com/trigger/), to simulate certain events like the user clicking a button.
202+
Because our components are very front end heavy, familiarize yourself with jQuery ways of interacting with the dom and our components. Maybe use ```dispatch();``` to simulate certain events like the user clicking a button.
203203

204204
We also understand that testing CSS properties is pretty tough so you’ll have to be creative when writing good tests that ensure the styling is still working. Try and cover as many cases as you can but don’t worry if there are some edge cases. You can add comments describing some problematic edge cases in TODOs so we know about them.
205205

Gruntfile.js

+10-33
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,25 @@ const path = require('path');
22
const sass = require('sass');
33
const webpackConfig = require('./webpack.config.js');
44

5-
module.exports = function(grunt) {
5+
module.exports = function (grunt) {
66
// configure the tasks
77
const config = {
88
jasmine: {
99
components: {
1010
src: ['bin/materialize.js'],
1111
options: {
12-
vendor: ['node_modules/jquery/dist/jquery.min.js'],
1312
styles: 'bin/materialize.css',
1413
specs: 'tests/spec/**/*Spec.js',
1514
helpers: 'tests/spec/helper.js',
1615
keepRunner: true,
17-
version: '3.8.0',
1816
page: {
1917
viewportSize: {
2018
width: 1400,
2119
height: 735
2220
}
2321
},
2422
sandboxArgs: {
25-
args: ['--headless', '--no-sandbox']
23+
args: ['--no-sandbox']
2624
}
2725
}
2826
}
@@ -80,17 +78,7 @@ module.exports = function(grunt) {
8078

8179
postcss: {
8280
options: {
83-
processors: [
84-
require('autoprefixer')({
85-
browsers: [
86-
'last 2 versions',
87-
'Chrome >= 30',
88-
'Firefox >= 30',
89-
'ie >= 10',
90-
'Safari >= 8'
91-
]
92-
})
93-
]
81+
processors: [require('autoprefixer')()]
9482
},
9583
expanded: {
9684
src: 'dist/css/materialize.css'
@@ -282,7 +270,7 @@ module.exports = function(grunt) {
282270
banner:
283271
'/*!\n * Materialize v' +
284272
grunt.option('newver') +
285-
' (https://materializecss.github.io/materialize)\n * Copyright 2014-' +
273+
' (https://materializeweb.com)\n * Copyright 2014-' +
286274
new Date().getFullYear() +
287275
' Materialize\n * MIT License (https://raw.githubusercontent.com/materializecss/materialize/master/LICENSE)\n */',
288276
linebreak: true
@@ -315,8 +303,8 @@ module.exports = function(grunt) {
315303
options: {
316304
port: 9001,
317305
protocol: 'http',
318-
middleware: function(connect, options, middlewares) {
319-
middlewares.unshift(function(req, res, next) {
306+
middleware: function (connect, options, middlewares) {
307+
middlewares.unshift(function (req, res, next) {
320308
res.setHeader('Access-Control-Allow-Origin', '*');
321309
res.setHeader('Access-Control-Allow-Credentials', true);
322310
res.setHeader(
@@ -343,13 +331,16 @@ module.exports = function(grunt) {
343331
grunt.loadNpmTasks('grunt-text-replace');
344332
grunt.loadNpmTasks('grunt-banner');
345333
grunt.loadNpmTasks('grunt-rename-util');
346-
grunt.loadNpmTasks('grunt-browser-sync');
347334
grunt.loadNpmTasks('grunt-contrib-jasmine');
348335
grunt.loadNpmTasks('grunt-postcss');
349336
grunt.loadNpmTasks('grunt-webpack');
350337
grunt.loadNpmTasks('grunt-contrib-connect');
351338

352339
// define tasks
340+
grunt.registerTask('monitor', ['concurrent:monitor']); // DEV
341+
grunt.registerTask('sass_compile', ['sass:gh', 'sass:bin', 'postcss:bin']);
342+
grunt.registerTask('jas_test', ['connect', 'jasmine']);
343+
grunt.registerTask('test', ['webpack:dev', 'sass_compile', 'jas_test']);
353344
grunt.registerTask('release', [
354345
'replace:version', // before webpack
355346
'sass:expanded',
@@ -368,18 +359,4 @@ module.exports = function(grunt) {
368359
'rename:rename_src',
369360
'rename:rename_compiled'
370361
]);
371-
372-
grunt.registerTask('sass_compile', ['sass:gh', 'sass:bin', 'postcss:bin']);
373-
grunt.registerTask('monitor', ['concurrent:monitor']); // DEV
374-
grunt.registerTask('test', ['webpack:dev', 'sass_compile', 'connect', 'jasmine']);
375-
grunt.registerTask('jas_test', ['connect', 'jasmine']);
376-
377-
grunt.registerTask('test_repeat', function() {
378-
const tasks = ['connect'];
379-
const n = 30;
380-
for (let i = 0; i < n; i++) {
381-
tasks.push('jasmine');
382-
}
383-
grunt.task.run(tasks);
384-
});
385362
};

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2023 Materialize
3+
Copyright (c) 2014-2024 Materialize
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

+15-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<a href="https://materializecss.github.io/materialize/">
2+
<a href="https://materializeweb.com" target="_blank">
33
<img src="https://materializeweb.com/images/materialize.svg" width="200">
44
</a>
55
</p>
@@ -9,7 +9,7 @@
99
<p align="center">
1010
Materialize, a CSS Framework based on Material Design.
1111
<br>
12-
<a href="https://materializecss.github.io/materialize/"><strong>-- Browse the docs --</strong></a>
12+
<a target="_blank" href="https://materializeweb.com"><strong>[ Browse the docs ]</strong></a>
1313
<br>
1414
<br>
1515
<a href="https://github.com/materializecss/materialize/actions/">
@@ -30,33 +30,31 @@
3030
</p>
3131

3232
## Quickstart
33-
Read the [getting started guide](https://materializecss.github.io/materialize/getting-started.html) for more information on how to use materialize.
33+
Read the [getting started guide](https://materializeweb.com/getting-started.html) for more information on how to use materialize.
3434

3535
- [Download the latest release](https://github.com/materializecss/materialize/releases/latest) of materialize directly from GitHub. ([Beta](https://github.com/materializecss/materialize/releases/))
3636
- Clone the repo: `git clone https://github.com/materializecss/materialize.git`
3737
- Include the files via [jsDelivr](https://www.jsdelivr.com/package/npm/@materializecss/materialize).
3838
- Install with [npm](https://www.npmjs.com): `npm install @materializecss/materialize` (Beta: `npm install @materializecss/materialize@next`)
3939

40-
## Documentation
41-
The documentation can be found at <https://materializecss.github.io/materialize>. To run the documentation locally on your machine, you need [Node.js](https://nodejs.org/en/) installed on your computer.
40+
## Development
41+
The documentation can be found at <https://materializeweb.com>. To run the documentation locally on your machine, you need [Node.js](https://nodejs.org) installed on your computer.
4242

43-
### Running documentation locally
44-
Run these commands to set up the documentation:
45-
46-
```bash
47-
git clone https://github.com/materializecss/materialize
48-
cd materialize
43+
This is the core project with all the components. To see how they are used we recommend using an example project or go to the documentation.
44+
Otherwise, if you want to develop the components itself, the dev process of this core-repo works like this:
45+
```sh
4946
npm install
47+
npm run dev
5048
```
5149

52-
Then run `npm run dev` to compile the documentation. When it finishes, open a new browser window and navigate to `localhost:8000/docs`. We use [BrowserSync](https://www.browsersync.io/) to display the documentation.
50+
### Running documentation locally
51+
See [Materialize Docs Repo](https://github.com/materializecss/materialize-docs) to see Materialize in Action.
5352

5453
### Documentation for previous releases
55-
Previous releases and their documentation are available for [download](https://github.com/materializecss/materialize/releases).
56-
57-
## Build
58-
If you want to build `materialize.css` or `materialize.js` from the latest commit, you can build the files with the following command after `npm install`. See `package.json` to check the current version like `1.0.0`.
54+
Previous releases are available [here](https://github.com/materializecss/materialize/releases).
5955

56+
## Release
57+
If you want to release `materialize.css` or `materialize.js` from the latest commit, you can build the files with the following command after `npm install`. See `package.json` to check the current version like `1.0.0`.
6058
```sh
6159
npm run release -- --oldver=<current_version> --newver=<new_version>
6260
```
@@ -100,4 +98,4 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
10098
[![Backers](https://opencollective.com/materialize/backers.svg?width=890)](https://opencollective.com/materialize#backers)
10199

102100
## Copyright and license
103-
Code Copyright 2023 Materialize. Code released under the MIT license.
101+
Code Copyright 2024 Materialize. Code released under the MIT license.

bower.json

-41
This file was deleted.

commitlint.config.js

-4
This file was deleted.

0 commit comments

Comments
 (0)