aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/e2e/protractor.conf.js10
-rw-r--r--client/e2e/src/videos.e2e-spec.ts2
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss9
-rw-r--r--client/src/app/shared/shared-user-settings/user-video-settings.component.scss4
-rw-r--r--client/src/sass/include/_mixins.scss11
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 = {
51 { 51 {
52 browserName: 'Chrome', 52 browserName: 'Chrome',
53 device: 'Google Nexus 6', 53 device: 'Google Nexus 6',
54 realMobile: 'true', 54 real_mobile: 'true',
55 os_version: '5.0', 55 os_version: '5.0',
56 name: 'Latest Chrome Android' 56 name: 'Latest Chrome Android'
57 }, 57 },
58 { 58 {
59 browserName: 'Safari', 59 browserName: 'Safari',
60 device: 'iPhone 8', 60 device: 'iPhone 8 Plus',
61 realMobile: 'true', 61 real_mobile: 'true',
62 os_version: '12', 62 os_version: '11',
63 name: 'Safari iPhone' 63 name: 'Safari iPhone'
64 }, 64 },
65 { 65 {
66 browserName: 'Safari', 66 browserName: 'Safari',
67 device: 'iPad 7th', 67 device: 'iPad 7th',
68 realMobile: 'true', 68 real_mobile: 'true',
69 os_version: '13', 69 os_version: '13',
70 name: 'Safari iPad' 70 name: 'Safari iPad'
71 } 71 }
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', () => {
208 208
209 await playerPage.waitUntilPlayerWrapper() 209 await playerPage.waitUntilPlayerWrapper()
210 210
211 console.log('Will set %s and %s tokens in local storage.', accessToken, refreshToken)
212
211 await browser.executeScript(`window.localStorage.setItem('access_token', '${accessToken}');`) 213 await browser.executeScript(`window.localStorage.setItem('access_token', '${accessToken}');`)
212 await browser.executeScript(`window.localStorage.setItem('refresh_token', '${refreshToken}');`) 214 await browser.executeScript(`window.localStorage.setItem('refresh_token', '${refreshToken}');`)
213 await browser.executeScript(`window.localStorage.setItem('token_type', 'Bearer');`) 215 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] {
42 @include peertube-select-container($form-base-input-width); 42 @include peertube-select-container($form-base-input-width);
43} 43}
44 44
45ng-select { 45ng-select,
46 @include ng-select($form-base-input-width);
47}
48
49my-select-checkbox { 46my-select-checkbox {
50 @include ng-select($form-base-input-width); 47 @include responsive-width($form-base-input-width);
48
49 display: block;
51} 50}
52 51
53input[type=submit] { 52input[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] {
20} 20}
21 21
22my-select-checkbox { 22my-select-checkbox {
23 @include ng-select(340px); 23 @include responsive-width(340px);
24
25 display: block;
24} 26}
25 27
26.form-group-select { 28.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 @@
313 } 313 }
314} 314}
315 315
316@mixin ng-select ($width) {
317 ::ng-deep &.ng-select,
318 ::ng-deep .ng-select {
319 width: $width;
320
321 @media screen and (max-width: $width) {
322 width: 100%;
323 }
324 }
325}
326
327@mixin peertube-select-container ($width) { 316@mixin peertube-select-container ($width) {
328 padding: 0; 317 padding: 0;
329 margin: 0; 318 margin: 0;