From b788e69131dccc1be147244e5b4d9e64deb2dc76 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 15 Mar 2022 14:12:37 +0100 Subject: [PATCH] Some fixes for themes --- .../edit-basic-configuration.component.html | 4 ++-- .../edit-live-configuration.component.html | 8 ++++---- .../edit-vod-transcoding.component.html | 8 ++++---- .../users/user-list/user-list.component.html | 2 +- .../my-account-profile.component.html | 2 +- .../my-account-profile.component.scss | 2 +- .../my-follows/my-followers.component.html | 2 +- .../my-ownership/my-ownership.component.html | 4 ++-- .../+page-not-found/page-not-found.component.html | 10 +++++----- .../playlist/video-watch-playlist.component.scss | 2 +- .../src/app/header/search-typeahead.component.html | 14 +++++++------- client/src/app/menu/menu.component.html | 6 +++--- .../shared-abuse-list/abuse-details.component.html | 10 +++++----- .../shared-forms/peertube-checkbox.component.html | 2 +- .../select/select-options.component.html | 2 +- .../select/select-shared.component.scss | 2 +- .../buttons/action-dropdown.component.html | 2 +- .../buttons/action-dropdown.component.scss | 1 - .../account-blocklist.component.html | 2 +- .../shared/shared-tables/video-cell.component.html | 2 +- .../video-filters-header.component.html | 2 +- client/src/sass/application.scss | 8 +++++++- client/src/sass/bootstrap.scss | 11 +++++++++-- client/src/sass/classes.scss | 4 ++++ client/src/sass/include/_mixins.scss | 8 ++++---- client/src/sass/include/_variables.scss | 4 ++++ client/src/sass/ng-select.scss | 5 +++++ 27 files changed, 77 insertions(+), 52 deletions(-) diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html index 37989cb59..3673a805b 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html @@ -186,7 +186,7 @@
{{ formErrors.signup.limit }}
- Signup won't be limited to a fixed number of users. + Signup won't be limited to a fixed number of users.
@@ -253,7 +253,7 @@
- allows to import multiple videos in parallel. ⚠️ Requires a PeerTube restart. + allows to import multiple videos in parallel. ⚠️ Requires a PeerTube restart.
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html index 8d6a4ce19..b29651437 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html @@ -50,7 +50,7 @@
@@ -63,7 +63,7 @@
@@ -139,7 +139,7 @@
- + will claim at most {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with VOD transcoding @@ -160,7 +160,7 @@
- new live transcoding profiles can be added by PeerTube plugins + new live transcoding profiles can be added by PeerTube plugins
- + The original file resolution will be the default target if no option is selected. @@ -142,7 +142,7 @@
- + will claim at most {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with live transcoding @@ -164,7 +164,7 @@
- allows to transcode multiple files in parallel. ⚠️ Requires a PeerTube restart + allows to transcode multiple files in parallel. ⚠️ Requires a PeerTube restart
@@ -176,7 +176,7 @@
- new transcoding profiles can be added by PeerTube plugins + new transcoding profiles can be added by PeerTube plugins
{{ user.account.displayName }} - {{ user.username }} + {{ user.username }}
diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html index eb2a48e15..ae5f25cff 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html @@ -8,7 +8,7 @@ type="text" id="username" class="form-control" formControlName="username" readonly > -
+
People can find you using @{{ user.username }}@{{ instanceHost }}
diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss index a5823fbc4..cbac81d01 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss +++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss @@ -10,7 +10,7 @@ label { margin-bottom: 15px; } -input#username + .text-muted { +input#username + .muted { margin-top: 5px; } diff --git a/client/src/app/+my-library/my-follows/my-followers.component.html b/client/src/app/+my-library/my-follows/my-followers.component.html index 4303695a3..a8a3da863 100644 --- a/client/src/app/+my-library/my-follows/my-followers.component.html +++ b/client/src/app/+my-library/my-follows/my-followers.component.html @@ -22,7 +22,7 @@ -
+
Is following all your channels Is following your channel {{ follow.following.name }}
diff --git a/client/src/app/+my-library/my-ownership/my-ownership.component.html b/client/src/app/+my-library/my-ownership/my-ownership.component.html index cb032505e..c29c71c0a 100644 --- a/client/src/app/+my-library/my-ownership/my-ownership.component.html +++ b/client/src/app/+my-library/my-ownership/my-ownership.component.html @@ -40,7 +40,7 @@
{{ videoChangeOwnership.initiatorAccount.displayName }} - {{ videoChangeOwnership.initiatorAccount.nameWithHost }} + {{ videoChangeOwnership.initiatorAccount.nameWithHost }}
@@ -56,7 +56,7 @@
{{ videoChangeOwnership.video.name }}
-
by {{ videoChangeOwnership.video.channel?.displayName }}
+
by {{ videoChangeOwnership.video.channel?.displayName }}
diff --git a/client/src/app/+page-not-found/page-not-found.component.html b/client/src/app/+page-not-found/page-not-found.component.html index 1e25e4495..0333f9550 100644 --- a/client/src/app/+page-not-found/page-not-found.component.html +++ b/client/src/app/+page-not-found/page-not-found.component.html @@ -1,14 +1,14 @@
{{ status }}. - That's an error. + That's an error.
We couldn't find any video tied to the URL {{ pathname }} you were looking for. We couldn't find any resource tied to the URL {{ pathname }} you were looking for.
-
+
Possible reasons: