Skip to content

Commit c1f6476

Browse files
authored
Merge pull request #481 from materializecss/v2-dev
Release 2.1.0
2 parents bde6acc + 62192a3 commit c1f6476

File tree

111 files changed

+1548
-7620
lines changed

Some content is hidden

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

111 files changed

+1548
-7620
lines changed

Gruntfile.js

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ const sass = require('sass');
33
const webpackConfig = require('./webpack.config.js');
44

55
module.exports = function (grunt) {
6-
// configure the tasks
76
const config = {
87
jasmine: {
98
components: {
@@ -53,17 +52,6 @@ module.exports = function (grunt) {
5352
}
5453
},
5554

56-
// Compile ghpages css
57-
gh: {
58-
options: {
59-
outputStyle: 'compressed',
60-
sourcemap: false
61-
},
62-
files: {
63-
'docs/css/ghpages-materialize.css': 'sass/ghpages-materialize.scss'
64-
}
65-
},
66-
6755
// Compile bin css
6856
bin: {
6957
options: {
@@ -158,62 +146,6 @@ module.exports = function (grunt) {
158146
{ expand: true, cwd: 'dist/js/', src: ['**/*'], dest: 'materialize-src/js/bin/' },
159147
{ expand: true, cwd: './', src: ['LICENSE', 'README.md'], dest: 'materialize-src/' }
160148
]
161-
},
162-
163-
starter_template: {
164-
options: {
165-
archive: 'templates/starter-template.zip',
166-
level: 6
167-
},
168-
files: [
169-
{ expand: true, cwd: 'dist/', src: ['**/*'], dest: 'starter-template/' },
170-
{
171-
expand: true,
172-
cwd: 'templates/starter-template/',
173-
src: ['index.html', 'LICENSE'],
174-
dest: 'starter-template/'
175-
},
176-
{
177-
expand: true,
178-
cwd: 'templates/starter-template/css',
179-
src: ['style.css'],
180-
dest: 'starter-template/css'
181-
},
182-
{
183-
expand: true,
184-
cwd: 'templates/starter-template/js',
185-
src: ['init.js'],
186-
dest: 'starter-template/js'
187-
}
188-
]
189-
},
190-
191-
parallax_template: {
192-
options: {
193-
archive: 'templates/parallax-template.zip',
194-
level: 6
195-
},
196-
files: [
197-
{ expand: true, cwd: 'dist/', src: ['**/*'], dest: 'parallax-template/' },
198-
{
199-
expand: true,
200-
cwd: 'templates/parallax-template/',
201-
src: ['index.html', 'LICENSE', 'background1.jpg', 'background2.jpg', 'background3.jpg'],
202-
dest: 'parallax-template/'
203-
},
204-
{
205-
expand: true,
206-
cwd: 'templates/parallax-template/css',
207-
src: ['style.css'],
208-
dest: 'parallax-template/css'
209-
},
210-
{
211-
expand: true,
212-
cwd: 'templates/parallax-template/js',
213-
src: ['init.js'],
214-
dest: 'parallax-template/js'
215-
}
216-
]
217149
}
218150
},
219151

@@ -338,7 +270,7 @@ module.exports = function (grunt) {
338270

339271
// define tasks
340272
grunt.registerTask('monitor', ['concurrent:monitor']); // DEV
341-
grunt.registerTask('sass_compile', ['sass:gh', 'sass:bin', 'postcss:bin']);
273+
grunt.registerTask('sass_compile', ['sass:bin', 'postcss:bin']);
342274
grunt.registerTask('jas_test', ['connect', 'jasmine']);
343275
grunt.registerTask('test', ['webpack:dev', 'sass_compile', 'jas_test']);
344276
grunt.registerTask('release', [
@@ -352,8 +284,6 @@ module.exports = function (grunt) {
352284
'usebanner:release',
353285
'compress:main',
354286
'compress:src',
355-
'compress:starter_template',
356-
'compress:parallax_template',
357287
'replace:version', // again because of cdn
358288
'replace:package_json',
359289
'rename:rename_src',

0 commit comments

Comments
 (0)