diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
commit | 64a8781e453c40ff144d03405abe2dc1ccfacbe0 (patch) | |
tree | 311473a357e3dedd496e1417293eed9a2a116ad6 /Gruntfile.js | |
parent | 9313ea9d440e3f93a6bb2d8c0fb6717364cd27f5 (diff) | |
parent | c64b4941d5222586a82d2c8d6a61969bb9cfe96b (diff) | |
download | wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.gz wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.zst wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.zip |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'Gruntfile.js')
-rw-r--r-- | Gruntfile.js | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index b80ab56d..72a407f9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js | |||
@@ -10,10 +10,6 @@ module.exports = function (grunt) { | |||
10 | postcss: { | 10 | postcss: { |
11 | material: { | 11 | material: { |
12 | options: { | 12 | options: { |
13 | map: { | ||
14 | inline: false, | ||
15 | }, | ||
16 | |||
17 | processors: [ | 13 | processors: [ |
18 | require('pixrem')(), | 14 | require('pixrem')(), |
19 | require('autoprefixer')({ browsers: 'last 2 versions' }), | 15 | require('autoprefixer')({ browsers: 'last 2 versions' }), |
@@ -25,10 +21,6 @@ module.exports = function (grunt) { | |||
25 | }, | 21 | }, |
26 | baggy: { | 22 | baggy: { |
27 | options: { | 23 | options: { |
28 | map: { | ||
29 | inline: false, | ||
30 | }, | ||
31 | |||
32 | processors: [ | 24 | processors: [ |
33 | require('pixrem')(), | 25 | require('pixrem')(), |
34 | require('autoprefixer')({ browsers: 'last 2 versions' }), | 26 | require('autoprefixer')({ browsers: 'last 2 versions' }), |
@@ -95,19 +87,13 @@ module.exports = function (grunt) { | |||
95 | files: { | 87 | files: { |
96 | '<%= releaseDir %>/themes/material/js/material.min.js': | 88 | '<%= releaseDir %>/themes/material/js/material.min.js': |
97 | ['<%= buildDir %>/material.browser.js'], | 89 | ['<%= buildDir %>/material.browser.js'], |
98 | }, | 90 | } |
99 | options: { | ||
100 | sourceMap: true, | ||
101 | }, | ||
102 | }, | 91 | }, |
103 | baggy: { | 92 | baggy: { |
104 | files: { | 93 | files: { |
105 | '<%= releaseDir %>/themes/baggy/js/baggy.min.js': | 94 | '<%= releaseDir %>/themes/baggy/js/baggy.min.js': |
106 | ['<%= buildDir %>/baggy.browser.js'], | 95 | ['<%= buildDir %>/baggy.browser.js'], |
107 | }, | 96 | } |
108 | options: { | ||
109 | sourceMap: true, | ||
110 | }, | ||
111 | }, | 97 | }, |
112 | }, | 98 | }, |
113 | copy: { | 99 | copy: { |