From 48586fe070c2a59e9febb62a7f41ebb384e1d20e Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 15 Dec 2020 11:45:29 +0100
Subject: [PATCH] Fix ng-select width

---
 client/e2e/protractor.conf.js                         | 10 +++++-----
 client/e2e/src/videos.e2e-spec.ts                     |  2 ++
 .../edit-custom-config.component.scss                 |  9 ++++-----
 .../user-video-settings.component.scss                |  4 +++-
 client/src/sass/include/_mixins.scss                  | 11 -----------
 5 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/client/e2e/protractor.conf.js b/client/e2e/protractor.conf.js
index be303bce4..2b26d2c40 100644
--- a/client/e2e/protractor.conf.js
+++ b/client/e2e/protractor.conf.js
@@ -51,21 +51,21 @@ exports.config = {
     {
       browserName: 'Chrome',
       device: 'Google Nexus 6',
-      realMobile: 'true',
+      real_mobile: 'true',
       os_version: '5.0',
       name: 'Latest Chrome Android'
     },
     {
       browserName: 'Safari',
-      device: 'iPhone 8',
-      realMobile: 'true',
-      os_version: '12',
+      device: 'iPhone 8 Plus',
+      real_mobile: 'true',
+      os_version: '11',
       name: 'Safari iPhone'
     },
     {
       browserName: 'Safari',
       device: 'iPad 7th',
-      realMobile: 'true',
+      real_mobile: 'true',
       os_version: '13',
       name: 'Safari iPad'
     }
diff --git a/client/e2e/src/videos.e2e-spec.ts b/client/e2e/src/videos.e2e-spec.ts
index a73b9f318..4fccdf1b6 100644
--- a/client/e2e/src/videos.e2e-spec.ts
+++ b/client/e2e/src/videos.e2e-spec.ts
@@ -208,6 +208,8 @@ describe('Videos workflow', () => {
 
     await playerPage.waitUntilPlayerWrapper()
 
+    console.log('Will set %s and %s tokens in local storage.', accessToken, refreshToken)
+
     await browser.executeScript(`window.localStorage.setItem('access_token', '${accessToken}');`)
     await browser.executeScript(`window.localStorage.setItem('refresh_token', '${refreshToken}');`)
     await browser.executeScript(`window.localStorage.setItem('token_type', 'Bearer');`)
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
index 4c64bd2e0..665247368 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
@@ -42,12 +42,11 @@ input[type=checkbox] {
   @include peertube-select-container($form-base-input-width);
 }
 
-ng-select {
-  @include ng-select($form-base-input-width);
-}
-
+ng-select,
 my-select-checkbox {
-  @include ng-select($form-base-input-width);
+  @include responsive-width($form-base-input-width);
+
+  display: block;
 }
 
 input[type=submit] {
diff --git a/client/src/app/shared/shared-user-settings/user-video-settings.component.scss b/client/src/app/shared/shared-user-settings/user-video-settings.component.scss
index d6a17703a..2cbd92d41 100644
--- a/client/src/app/shared/shared-user-settings/user-video-settings.component.scss
+++ b/client/src/app/shared/shared-user-settings/user-video-settings.component.scss
@@ -20,7 +20,9 @@ input[type=submit] {
 }
 
 my-select-checkbox {
-  @include ng-select(340px);
+  @include responsive-width(340px);
+
+  display: block;
 }
 
 .form-group-select {
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 1231d2c44..10ab44f57 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -313,17 +313,6 @@
   }
 }
 
-@mixin ng-select ($width) {
-  ::ng-deep &.ng-select,
-  ::ng-deep .ng-select {
-    width: $width;
-
-    @media screen and (max-width: $width) {
-      width: 100%;
-    }
-  }
-}
-
 @mixin peertube-select-container ($width) {
   padding: 0;
   margin: 0;