From 79a899410fdf6d7d4fcb22f05314c9ed3fc5d591 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 22 Aug 2019 10:02:32 +0200 Subject: [PATCH] Cleanup SASS imports --- client/src/app/app.component.ts | 2 +- client/src/sass/application.scss | 1 - client/src/sass/player/_player-variables.scss | 6 ------ 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 { new Hotkey('g o', (event: KeyboardEvent): boolean => { this.router.navigate([ '/videos/overview' ]) return false - }, undefined, this.i18n('Go to the videos discover page')), + }, undefined, this.i18n('Go to the discover videos page')), new Hotkey('g t', (event: KeyboardEvent): boolean => { this.router.navigate([ '/videos/trending' ]) 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 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; -@import '_bootstrap'; @import '_variables'; @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%); $progress-margin: 10px; $assets-path: '../../assets/' !default; - -body { - --embedForegroundColor: #{$primary-foreground-color}; - - --embedBigPlayBackgroundColor: #{$primary-background-color}; -} diff --git a/client/src/sass/player/peertube-skin.scss b/client/src/sass/player/peertube-skin.scss index 996024ade..1a5144b11 100644 --- a/client/src/sass/player/peertube-skin.scss +++ b/client/src/sass/player/peertube-skin.scss @@ -2,6 +2,12 @@ @import '_mixins'; @import './_player-variables'; +body { + --embedForegroundColor: #{$primary-foreground-color}; + + --embedBigPlayBackgroundColor: #{$primary-background-color}; +} + @mixin big-play-button-triangle-size($triangle-size) { width: $triangle-size; height: $triangle-size; -- 2.25.1