diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-09-20 16:24:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 16:24:31 +0200 |
| commit | 0491173a61aed66205c017e0d7e0503ea316c144 (patch) | |
| tree | ce6621597505f9518cfdf0981977d097c63f9fad /client/src/sass/application.scss | |
| parent | 8704acf49efc770d73bf07c10468ed8c74d28a83 (diff) | |
| parent | 6247b2057b792cea155a1abd9788c363ae7d2cc2 (diff) | |
| download | PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.gz PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.zst PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.zip | |
Merge branch 'develop' into cli-wrapper
Diffstat (limited to 'client/src/sass/application.scss')
| -rw-r--r-- | client/src/sass/application.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index caf039b6d..f21b91d2e 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
| @@ -9,7 +9,7 @@ $icon-font-path: '../../node_modules/@neos21/bootstrap3-glyphicons/assets/fonts/ | |||
| 9 | @import '~video.js/dist/video-js.css'; | 9 | @import '~video.js/dist/video-js.css'; |
| 10 | 10 | ||
| 11 | $assets-path: '../assets/'; | 11 | $assets-path: '../assets/'; |
| 12 | @import './player/player'; | 12 | @import './player/index'; |
| 13 | @import './loading-bar'; | 13 | @import './loading-bar'; |
| 14 | 14 | ||
| 15 | @import './primeng-custom'; | 15 | @import './primeng-custom'; |