diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2017-12-11 11:06:32 +0100 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2017-12-11 11:06:32 +0100 |
| commit | fada8d75550dc7365f7e18ee1569b9406251d660 (patch) | |
| tree | db9dc01c18693824f83fce5020f4c1f3ae7c0865 /client/config/webpack.video-embed.js | |
| parent | 492fd28167f770d79a430fc57451b5a9e075d8e7 (diff) | |
| parent | c2830fa8f84f61462098bf36add824f89436dfa9 (diff) | |
| download | PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.gz PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.zst PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.zip | |
Merge branch 'feature/design' into develop
Diffstat (limited to 'client/config/webpack.video-embed.js')
| -rw-r--r-- | client/config/webpack.video-embed.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/config/webpack.video-embed.js b/client/config/webpack.video-embed.js index fe40194cf..2b70b6681 100644 --- a/client/config/webpack.video-embed.js +++ b/client/config/webpack.video-embed.js | |||
| @@ -74,7 +74,8 @@ module.exports = function (options) { | |||
| 74 | loader: 'sass-resources-loader', | 74 | loader: 'sass-resources-loader', |
| 75 | options: { | 75 | options: { |
| 76 | resources: [ | 76 | resources: [ |
| 77 | helpers.root('src/sass/_variables.scss') | 77 | helpers.root('src/sass/_variables.scss'), |
| 78 | helpers.root('src/sass/_mixins.scss') | ||
| 78 | ] | 79 | ] |
| 79 | } | 80 | } |
| 80 | } | 81 | } |