Commit 5a619d17 authored by Mark Swillus's avatar Mark Swillus
Browse files

Merge branch...

Merge branch '59-follow-up-from-resolve-deploy-to-something-other-than-course-uploads' into 'master'

Fix totp and fonts loading

See merge request !34
parents b4c4c28f a644b7c2
Pipeline #11596 passed with stages
in 4 minutes and 28 seconds
......@@ -9,7 +9,6 @@ package-lock.json
/build/
/server/
.sass-cache
yarn.lock
./src/sass/_vars.scss
.scss-lint.yml
src/js/*.compiled.js
......
......@@ -216,19 +216,19 @@ module.exports = (grunt) ->
{
expand: true
cwd: 'src/media'
src: '*.*'
src: '**'
dest: '<%= settings.build.build_folder %><%= settings.build.media_path %>'
}
{
expand: true
cwd: 'node_modules/edx-pattern-library/pattern-library/fonts/OpenSans'
src: '*.*'
cwd: 'node_modules/edx-pattern-library/pattern-library/fonts/'
src: '**'
dest: '<%= settings.build.build_folder %><%= settings.build.fonts_path %>'
}
{
expand: true
cwd: 'node_modules/font-awesome/fonts'
src: '*.*'
src: '**'
dest: '<%= settings.build.build_folder %><%= settings.build.fonts_path %>'
}
]
......
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment