diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 19:12:10 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 21:00:30 +0100 |
commit | a2a64ecd3e3551707412c47f0d16e484dea25632 (patch) | |
tree | bc4e0b8e0ca2a2735f527bff8bd73421c0ff72dd /postcss.config.js | |
parent | fb0c906c717f2b21bb63610742a357850142b522 (diff) | |
parent | 70801b850c78d7879182eeba4eae509af42fafeb (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.
Diffstat (limited to 'postcss.config.js')
-rw-r--r-- | postcss.config.js | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/postcss.config.js b/postcss.config.js index 84701e4ad..1c820c318 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,13 +1,7 @@ -module.exports = { +module.exports = ({ env }) => ({ plugins: { - autoprefixer: { - browsers: [ - 'last 2 versions', - 'IE >= 11', - 'iOS >= 9', - ], - }, + autoprefixer: {}, 'postcss-object-fit-images': {}, - cssnano: {}, + cssnano: env === 'production' ? {} : false, }, -}; +}); |