diff options
author | Chocobozzz <me@florianbigard.com> | 2019-08-22 10:02:32 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-08-22 10:33:57 +0200 |
commit | 122dbb5705a4b9c5d495f13a41a29bc74a8e542d (patch) | |
tree | 22815f0fa7a6be8fa4aa61ce04d583c7618727ff | |
parent | eddd920987fb8e4ae8c7ad2ada8a10a452e451d8 (diff) | |
download | PeerTube-122dbb5705a4b9c5d495f13a41a29bc74a8e542d.tar.gz PeerTube-122dbb5705a4b9c5d495f13a41a29bc74a8e542d.tar.zst PeerTube-122dbb5705a4b9c5d495f13a41a29bc74a8e542d.zip |
Cleanup SASS imports
-rw-r--r-- | client/src/app/app.component.ts | 2 | ||||
-rw-r--r-- | client/src/sass/application.scss | 1 | ||||
-rw-r--r-- | client/src/sass/player/_player-variables.scss | 6 | ||||
-rw-r--r-- | client/src/sass/player/peertube-skin.scss | 6 |
4 files changed, 7 insertions, 8 deletions
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index 83a751dd6..50c5f5b9b 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts | |||
@@ -226,7 +226,7 @@ export class AppComponent implements OnInit { | |||
226 | new Hotkey('g o', (event: KeyboardEvent): boolean => { | 226 | new Hotkey('g o', (event: KeyboardEvent): boolean => { |
227 | this.router.navigate([ '/videos/overview' ]) | 227 | this.router.navigate([ '/videos/overview' ]) |
228 | return false | 228 | return false |
229 | }, undefined, this.i18n('Go to the videos discover page')), | 229 | }, undefined, this.i18n('Go to the discover videos page')), |
230 | new Hotkey('g t', (event: KeyboardEvent): boolean => { | 230 | new Hotkey('g t', (event: KeyboardEvent): boolean => { |
231 | this.router.navigate([ '/videos/trending' ]) | 231 | this.router.navigate([ '/videos/trending' ]) |
232 | return false | 232 | return false |
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index c64a8ebf8..4fa722327 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -1,5 +1,4 @@ | |||
1 | $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | 1 | $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; |
2 | @import '_bootstrap'; | ||
3 | 2 | ||
4 | @import '_variables'; | 3 | @import '_variables'; |
5 | @import '_mixins'; | 4 | @import '_mixins'; |
diff --git a/client/src/sass/player/_player-variables.scss b/client/src/sass/player/_player-variables.scss index 4e9e8736c..0c2359ac7 100644 --- a/client/src/sass/player/_player-variables.scss +++ b/client/src/sass/player/_player-variables.scss | |||
@@ -11,9 +11,3 @@ $slider-bg-color: lighten($primary-background-color, 33%); | |||
11 | $progress-margin: 10px; | 11 | $progress-margin: 10px; |
12 | 12 | ||
13 | $assets-path: '../../assets/' !default; | 13 | $assets-path: '../../assets/' !default; |
14 | |||
15 | body { | ||
16 | --embedForegroundColor: #{$primary-foreground-color}; | ||
17 | |||
18 | --embedBigPlayBackgroundColor: #{$primary-background-color}; | ||
19 | } | ||
diff --git a/client/src/sass/player/peertube-skin.scss b/client/src/sass/player/peertube-skin.scss index 039cf7e00..4bf48a570 100644 --- a/client/src/sass/player/peertube-skin.scss +++ b/client/src/sass/player/peertube-skin.scss | |||
@@ -2,6 +2,12 @@ | |||
2 | @import '_mixins'; | 2 | @import '_mixins'; |
3 | @import './_player-variables'; | 3 | @import './_player-variables'; |
4 | 4 | ||
5 | body { | ||
6 | --embedForegroundColor: #{$primary-foreground-color}; | ||
7 | |||
8 | --embedBigPlayBackgroundColor: #{$primary-background-color}; | ||
9 | } | ||
10 | |||
5 | @mixin big-play-button-triangle-size($triangle-size) { | 11 | @mixin big-play-button-triangle-size($triangle-size) { |
6 | width: $triangle-size; | 12 | width: $triangle-size; |
7 | height: $triangle-size; | 13 | height: $triangle-size; |