forks
/
peertube
1
0
Fork 0
Code Releases Activity

Fix ng-select width

This commit is contained in:
Chocobozzz 2020-12-15 11:45:29 +01:00
parent d89fcd1e5e
commit 48586fe070
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/e2e/protractor.conf.js
View File

@ -51,21 +51,21 @@ exports.config = {
{ {
browserName: 'Chrome', browserName: 'Chrome',
device: 'Google Nexus 6', device: 'Google Nexus 6',
realMobile: 'true', real_mobile: 'true',
os_version: '5.0', os_version: '5.0',
name: 'Latest Chrome Android' name: 'Latest Chrome Android'
}, },
{ {
browserName: 'Safari', browserName: 'Safari',
device: 'iPhone 8', device: 'iPhone 8 Plus',
realMobile: 'true', real_mobile: 'true',
os_version: '12', os_version: '11',
name: 'Safari iPhone' name: 'Safari iPhone'
}, },
{ {
browserName: 'Safari', browserName: 'Safari',
device: 'iPad 7th', device: 'iPad 7th',
realMobile: 'true', real_mobile: 'true',
os_version: '13', os_version: '13',
name: 'Safari iPad' name: 'Safari iPad'
} }

2
client/e2e/src/videos.e2e-spec.ts
View File

@ -208,6 +208,8 @@ describe('Videos workflow', () => {
await playerPage.waitUntilPlayerWrapper() 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('access_token', '${accessToken}');`)
await browser.executeScript(`window.localStorage.setItem('refresh_token', '${refreshToken}');`) await browser.executeScript(`window.localStorage.setItem('refresh_token', '${refreshToken}');`)
await browser.executeScript(`window.localStorage.setItem('token_type', 'Bearer');`) await browser.executeScript(`window.localStorage.setItem('token_type', 'Bearer');`)

9
client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
View File

@ -42,12 +42,11 @@ input[type=checkbox] {
@include peertube-select-container($form-base-input-width); @include peertube-select-container($form-base-input-width);
} }
ng-select { ng-select,
@include ng-select($form-base-input-width);
}
my-select-checkbox { my-select-checkbox {
@include ng-select($form-base-input-width); @include responsive-width($form-base-input-width);
display: block;
} }
input[type=submit] { input[type=submit] {

4
client/src/app/shared/shared-user-settings/user-video-settings.component.scss
View File

@ -20,7 +20,9 @@ input[type=submit] {
} }
my-select-checkbox { my-select-checkbox {
@include ng-select(340px); @include responsive-width(340px);
display: block;
} }
.form-group-select { .form-group-select {

11
client/src/sass/include/_mixins.scss
View File

@ -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) { @mixin peertube-select-container ($width) {
padding: 0; padding: 0;
margin: 0; margin: 0;