Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix select style for redundancy

Chocobozzzb9dbc15c25d4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f40639fe8..e88c7eeae9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
### IMPORTANT NOTES
* Database migrations of this version can take a long time (up to 30 minutes on an instance with many users/federation actors and a slow database disk)
- * You need to manually execute a migration script **after your upgrade** while PeerTube is running and the database migration is complete (`Migrations finished. New migration version schema: 965` in PeerTube startup logs):
+ * You need to manually execute a migration script **after your upgrade** while PeerTube is running and the database migration is complete (`Migrations finished. New migration version schema: 970` in PeerTube startup logs):
* Classic installation: `cd /var/www/peertube/peertube-latest && sudo -u peertube NODE_CONFIG_DIR=/var/www/peertube/config NODE_ENV=production node dist/scripts/migrations/peertube-8.0.js`
* Docker installation: `cd /var/www/peertube-docker && docker compose exec -u peertube peertube node dist/scripts/migrations/peertube-8.0.js`
* `yarn` NodeJS packages manager has been removed in favor of `pnpm`. Follow the [dependencies guide](https://docs.joinpeertube.org/support/doc/dependencies) to install `pnpm` on your system **before the upgrade**
diff --git a/client/src/app/+admin/config/pages/admin-config-common.scss b/client/src/app/+admin/config/pages/admin-config-common.scss
index 774a8a682c..99d9e7d47c 100644
--- a/client/src/app/+admin/config/pages/admin-config-common.scss
+++ b/client/src/app/+admin/config/pages/admin-config-common.scss
@@ -33,7 +33,7 @@ input[type="checkbox"] {
}
.peertube-select-container {
- @include peertube-select-container($form-base-input-width);
+ @include responsive-width($form-base-input-width);
}
my-select-videos-sort,
diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.component.scss b/client/src/app/+admin/overview/users/user-edit/user-edit.component.scss
index 93024f9b2d..15493a5e61 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-edit.component.scss
+++ b/client/src/app/+admin/overview/users/user-edit/user-edit.component.scss
@@ -17,7 +17,7 @@ my-input-text {
}
.peertube-select-container {
- @include peertube-select-container($form-base-input-width);
+ @include responsive-width($form-base-input-width);
}
my-select-custom-value {
diff --git a/client/src/app/+admin/system/logs/logs.component.scss b/client/src/app/+admin/system/logs/logs.component.scss
index 7f914b2597..41a962a8ac 100644
--- a/client/src/app/+admin/system/logs/logs.component.scss
+++ b/client/src/app/+admin/system/logs/logs.component.scss
@@ -1,6 +1,6 @@
-@use '_variables' as *;
-@use '_mixins' as *;
-@use '_form-mixins' as *;
+@use "_variables" as *;
+@use "_mixins" as *;
+@use "_form-mixins" as *;
.logs {
font-family: monospace;
@@ -56,7 +56,7 @@
margin-bottom: 10px;
.peertube-select-container {
- @include peertube-select-container(150px);
+ @include responsive-width(150px);
}
my-select-tags {
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss
index e8a9d4393e..daaafc79cf 100644
--- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss
@@ -8,8 +8,4 @@
flex-wrap: wrap;
gap: 0.5rem;
margin-bottom: 1.25rem;
-
- .peertube-select-container {
- @include peertube-select-container(auto);
- }
}
diff --git a/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.scss b/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.scss
index 11e98f44ee..f8b8d3debd 100644
--- a/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.scss
+++ b/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.scss
@@ -1,7 +1,7 @@
-@use '_variables' as *;
-@use '_mixins' as *;
-@use '_form-mixins' as *;
+@use "_variables" as *;
+@use "_mixins" as *;
+@use "_form-mixins" as *;
.peertube-select-container {
- @include peertube-select-container(350px);
+ @include responsive-width(350px);
}
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.scss b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.scss
index 74b497f562..e48e2b61de 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.scss
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.scss
@@ -7,7 +7,7 @@ input[type="text"] {
}
.peertube-select-container {
- @include peertube-select-container(340px);
+ @include responsive-width(340px);
}
my-select-channel,
diff --git a/client/src/app/+search/search-filters.component.scss b/client/src/app/+search/search-filters.component.scss
index fd66898e63..2b70034129 100644
--- a/client/src/app/+search/search-filters.component.scss
+++ b/client/src/app/+search/search-filters.component.scss
@@ -1,6 +1,6 @@
-@use '_variables' as *;
-@use '_mixins' as *;
-@use '_form-mixins' as *;
+@use "_variables" as *;
+@use "_mixins" as *;
+@use "_form-mixins" as *;
form {
margin-top: 40px;
@@ -18,11 +18,9 @@ form {
.peertube-select-container {
margin-bottom: 1rem;
-
- @include peertube-select-container(auto);
}
-input[type=text] {
+input[type="text"] {
@include peertube-input-text(100%);
}
diff --git a/client/src/app/+videos-publish-manage/+video-publish/shared/common-publish.scss b/client/src/app/+videos-publish-manage/+video-publish/shared/common-publish.scss
index 42dc8a4e10..bbb30beda1 100644
--- a/client/src/app/+videos-publish-manage/+video-publish/shared/common-publish.scss
+++ b/client/src/app/+videos-publish-manage/+video-publish/shared/common-publish.scss
@@ -27,7 +27,7 @@ $width-size: 275px;
}
.peertube-select-container {
- @include peertube-select-container($width-size);
+ @include responsive-width($width-size);
}
my-select-channel,
diff --git a/client/src/app/+videos-publish-manage/shared-manage/common/video-manage-page-common.scss b/client/src/app/+videos-publish-manage/shared-manage/common/video-manage-page-common.scss
index e7a4daa3ae..292f21c5e9 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/common/video-manage-page-common.scss
+++ b/client/src/app/+videos-publish-manage/shared-manage/common/video-manage-page-common.scss
@@ -8,10 +8,6 @@
}
}
-.peertube-select-container {
- @include peertube-select-container(auto);
-}
-
my-peertube-checkbox {
display: block;
margin-bottom: 1rem;
diff --git a/client/src/app/shared/shared-forms/dynamic-form-field.component.scss b/client/src/app/shared/shared-forms/dynamic-form-field.component.scss
index 63fadf1f80..50be869eec 100644
--- a/client/src/app/shared/shared-forms/dynamic-form-field.component.scss
+++ b/client/src/app/shared/shared-forms/dynamic-form-field.component.scss
@@ -18,7 +18,7 @@ textarea {
}
.peertube-select-container {
- @include peertube-select-container(340px);
+ @include responsive-width(340px);
}
my-markdown-textarea {
diff --git a/client/src/app/shared/shared-forms/select/select-options.component.html b/client/src/app/shared/shared-forms/select/select-options.component.html
index 1a8f1a0a91..0fb9c6be22 100644
--- a/client/src/app/shared/shared-forms/select/select-options.component.html
+++ b/client/src/app/shared/shared-forms/select/select-options.component.html
@@ -32,7 +32,7 @@
} @else {
<div>
<div class="d-flex align-items-center item-label custom-item">
- @if (item.imageUrl) {
+ @if (item?.imageUrl) {
<img alt="" class="me-2" [src]="item.imageUrl" />
}
diff --git a/client/src/app/shared/shared-share-modal/video-share.component.scss b/client/src/app/shared/shared-share-modal/video-share.component.scss
index 0929e2de64..4bfe37cca4 100644
--- a/client/src/app/shared/shared-share-modal/video-share.component.scss
+++ b/client/src/app/shared/shared-share-modal/video-share.component.scss
@@ -1,6 +1,6 @@
-@use '_variables' as *;
-@use '_mixins' as *;
-@use '_form-mixins' as *;
+@use "_variables" as *;
+@use "_mixins" as *;
+@use "_form-mixins" as *;
my-timestamp-input {
width: 100px;
@@ -15,7 +15,7 @@ my-input-text {
}
.peertube-select-container {
- @include peertube-select-container(200px);
+ @include responsive-width(200px);
}
.qr-code-group {
diff --git a/client/src/app/shared/shared-user-settings/user-interface-settings.component.scss b/client/src/app/shared/shared-user-settings/user-interface-settings.component.scss
index 9a2f49720c..87919e7b7d 100644
--- a/client/src/app/shared/shared-user-settings/user-interface-settings.component.scss
+++ b/client/src/app/shared/shared-user-settings/user-interface-settings.component.scss
@@ -1,10 +1,10 @@
-@use '_variables' as *;
-@use '_mixins' as *;
-@use '_button-mixins' as *;
-@use 'form-mixins' as *;
+@use "_variables" as *;
+@use "_mixins" as *;
+@use "_button-mixins" as *;
+@use "form-mixins" as *;
.peertube-select-container {
margin-bottom: 30px;
- @include peertube-select-container(340px);
+ @include responsive-width(340px);
}
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 dc1b30423e..0fc32dcfbc 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
@@ -1,9 +1,9 @@
-@use '_variables' as *;
-@use '_mixins' as *;
-@use '_form-mixins' as *;
+@use "_variables" as *;
+@use "_mixins" as *;
+@use "_form-mixins" as *;
.peertube-select-container {
- @include peertube-select-container(340px);
+ @include responsive-width(340px);
}
my-select-languages {
diff --git a/client/src/app/shared/shared-video-miniature/download/video-download.component.scss b/client/src/app/shared/shared-video-miniature/download/video-download.component.scss
index ec368caa12..1317601585 100644
--- a/client/src/app/shared/shared-video-miniature/download/video-download.component.scss
+++ b/client/src/app/shared/shared-video-miniature/download/video-download.component.scss
@@ -1,14 +1,13 @@
-@use '_variables' as *;
-@use '_mixins' as *;
-@use 'form-mixins' as *;
+@use "_variables" as *;
+@use "_mixins" as *;
+@use "form-mixins" as *;
.modal-body ::ng-deep {
-
.nav-content {
margin-top: 30px;
}
- my-global-icon[iconName=shield] {
+ my-global-icon[iconName="shield"] {
position: relative;
top: -1px;
@@ -26,12 +25,6 @@
}
}
-.peertube-select-container.title-select {
- @include peertube-select-container(auto);
-}
-
#dropdown-download-type {
cursor: pointer;
}
-
-
diff --git a/client/src/sass/class-helpers/_forms.scss b/client/src/sass/class-helpers/_forms.scss
index 577c5e55c3..c86b4c5e13 100644
--- a/client/src/sass/class-helpers/_forms.scss
+++ b/client/src/sass/class-helpers/_forms.scss
@@ -6,6 +6,10 @@
@include peertube-radio-container;
}
+.peertube-select-container {
+ @include peertube-select-container(auto);
+}
+
.pt-input-text {
@include peertube-input-text(100%);
}