Skip to content

Commit 488b773

Browse files
committed
Removed temp directory and changed css/js paths
Kind of an experiment
1 parent d17df4f commit 488b773

6 files changed

Lines changed: 12 additions & 15 deletions

File tree

config/grunt/clean.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ module.exports = {
1313
css: {
1414
src: [
1515
'css/*',
16+
'css/**',
1617
'!<%= paths.cssSrc %>**',
1718
'<%= paths.cssSrc %>vendor/'
1819
]
@@ -24,14 +25,10 @@ module.exports = {
2425
'<%= paths.fontSrc %>vendor/'
2526
]
2627
},
27-
tmp: {
28-
src: [
29-
'<%= paths.tmp %>'
30-
]
31-
},
3228
js: {
3329
src: [
3430
'js/*',
31+
'js/**',
3532
'!<%= paths.jsSrc %>**',
3633
'<%= paths.jsSrc %>*.min.js',
3734
'<%= paths.jsSrc %>vendor/'
@@ -40,6 +37,7 @@ module.exports = {
4037
images: {
4138
src: [
4239
'images/*',
40+
'images/**',
4341
'!<%= paths.imagesSrc %>**'
4442
]
4543
},
@@ -53,5 +51,4 @@ module.exports = {
5351
'<%= paths.release %>'
5452
]
5553
}
56-
5754
};

config/grunt/cssmin.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ module.exports = {
66
},
77
style: {
88
expand: true,
9-
cwd: '<%= paths.tmp %>',
9+
cwd: '<%= paths.cssDist %>',
1010
src: [
1111
'*.css',
1212
'**/*.css',
1313
'!*.min.css',
1414
'!**/*.min.css'
1515
],
16-
dest: '<%= paths.tmp %>',
16+
dest: '<%= paths.cssDist %>',
1717
ext: '.min.css',
1818
extDot: 'last'
1919
}

config/grunt/imagemin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
'*',
1010
'**/*'
1111
],
12-
dest: 'images/'
12+
dest: '<%= paths.imagesDist %>'
1313
}
1414
]
1515
}

config/grunt/postcss.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ module.exports = {
1919
},
2020
plugin: {
2121
expand: true,
22-
cwd: '<%= paths.tmp %>',
22+
cwd: '<%= paths.cssDist %>',
2323
src: [
2424
'*.css',
2525
'**/*.css',
2626
'!*.min.css',
2727
'!**/*.min.css'
2828
],
29-
dest: '<%= paths.tmp %>',
29+
dest: '<%= paths.cssDist %>',
3030
ext: '.css',
3131
extDot: 'last'
3232
}

config/grunt/rtlcss.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
},
1010
plugin: {
1111
expand: true,
12-
cwd: '<%= paths.tmp %>',
12+
cwd: '<%= paths.cssDist %>',
1313
src: [
1414
'*.css',
1515
'**/*.css',
@@ -18,7 +18,7 @@ module.exports = {
1818
'!*.min.css',
1919
'!**/*.min.css'
2020
],
21-
dest: '<%= paths.tmp %>',
21+
dest: '<%= paths.cssDist %>',
2222
ext: '-rtl.css',
2323
extDot: 'last'
2424
}

config/grunt/uglify.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ module.exports = {
1010
files: [
1111
{
1212
expand: true,
13-
cwd: 'js/',
13+
cwd: '<%= paths.jsDist %>',
1414
src: [
1515
'**/*.js',
1616
'!**/*.min.js'
1717
],
18-
dest: 'js/',
18+
dest: '<%= paths.jsDist %>',
1919
ext: '.min.js',
2020
extDot: 'last'
2121
}

0 commit comments

Comments
 (0)