From 79a899410fdf6d7d4fcb22f05314c9ed3fc5d591 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 22 Aug 2019 10:02:32 +0200
Subject: Cleanup SASS imports

---
 client/src/sass/application.scss              | 1 -
 client/src/sass/player/_player-variables.scss | 6 ------
 client/src/sass/player/peertube-skin.scss     | 6 ++++++
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'client/src/sass')

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;
-- 
cgit v1.2.3


From 6eb62c33908025d877a28f1cfbc527c511ae3103 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 22 Aug 2019 13:59:54 +0200
Subject: Fix video rows overflow

In discover and account channel videos pages
---
 client/src/sass/include/_miniature.scss | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'client/src/sass')

diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scss
index e4ed88d31..56126d41f 100644
--- a/client/src/sass/include/_miniature.scss
+++ b/client/src/sass/include/_miniature.scss
@@ -140,9 +140,6 @@ $play-overlay-width: 18px;
 }
 
 @mixin miniature-rows {
-  max-height: 540px; // 2 rows max
-  overflow: hidden;
-
   &:first-child {
     padding-top: 30px;
 
-- 
cgit v1.2.3