From b788e69131dccc1be147244e5b4d9e64deb2dc76 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 15 Mar 2022 14:12:37 +0100 Subject: Some fixes for themes --- .../edit-basic-configuration.component.html | 4 ++-- .../edit-live-configuration.component.html | 8 ++++---- .../edit-custom-config/edit-vod-transcoding.component.html | 8 ++++---- .../overview/users/user-list/user-list.component.html | 2 +- .../my-account-profile/my-account-profile.component.html | 2 +- .../my-account-profile/my-account-profile.component.scss | 2 +- .../app/+my-library/my-follows/my-followers.component.html | 2 +- .../+my-library/my-ownership/my-ownership.component.html | 4 ++-- .../src/app/+page-not-found/page-not-found.component.html | 10 +++++----- .../shared/playlist/video-watch-playlist.component.scss | 2 +- client/src/app/header/search-typeahead.component.html | 14 +++++++------- client/src/app/menu/menu.component.html | 6 +++--- .../shared/shared-abuse-list/abuse-details.component.html | 10 +++++----- .../shared/shared-forms/peertube-checkbox.component.html | 2 +- .../shared-forms/select/select-options.component.html | 2 +- .../shared-forms/select/select-shared.component.scss | 2 +- .../shared-main/buttons/action-dropdown.component.html | 2 +- .../shared-main/buttons/action-dropdown.component.scss | 1 - .../shared-moderation/account-blocklist.component.html | 2 +- .../src/app/shared/shared-tables/video-cell.component.html | 2 +- .../video-filters-header.component.html | 2 +- 21 files changed, 44 insertions(+), 45 deletions(-) (limited to 'client/src/app') 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:
    @@ -24,7 +24,7 @@
    {{ status }}. - You are not authorized here. + You are not authorized here.
    You might need to check your account is allowed by the video or instance owner. @@ -34,12 +34,12 @@
    {{ status }}. - I'm a teapot. + I'm a teapot.
    The requested entity body blends sweet bits with a mellow earthiness.
    -
    Sepia seems to like it.
    +
    Sepia seems to like it.
    {{ status }} mascot diff --git a/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.scss b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.scss index fc67ac65a..5c3453e4b 100644 --- a/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.scss +++ b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.scss @@ -14,7 +14,7 @@ .playlist-info { padding: 5px 30px; - background-color: #e4e4e4; + background-color: pvar(--greyBackgroundColor); .playlist-display-name { font-size: 18px; diff --git a/client/src/app/header/search-typeahead.component.html b/client/src/app/header/search-typeahead.component.html index 9b21d3f86..7a9b6c51f 100644 --- a/client/src/app/header/search-typeahead.component.html +++ b/client/src/app/header/search-typeahead.component.html @@ -24,21 +24,21 @@
    -
    +
    using {{ serverConfig.search.searchIndex.url }}
    -
    Results will be augmented with those of a third-party index. Only data necessary to make the query will be sent.
    +
    Results will be augmented with those of a third-party index. Only data necessary to make the query will be sent.
    - Your query will be matched against video names or descriptions, channel names. + Your query will be matched against video names or descriptions, channel names.
    - + any instance only followed instances @@ -47,13 +47,13 @@
    • - @channel_id@domain will list the matching channel + @channel_id@domain will list the matching channel
    • - URL will list the matching channel + URL will list the matching channel
    • - UUID will list the matching video + UUID will list the matching video
    diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html index 5b9e821a7..0a364dcc8 100644 --- a/client/src/app/menu/menu.component.html +++ b/client/src/app/menu/menu.component.html @@ -36,14 +36,14 @@ > Interface: - {{ currentInterfaceLanguage }} + {{ currentInterfaceLanguage }} Videos: - {{ videoLanguages.join(', ') }} + {{ videoLanguages.join(', ') }} diff --git a/client/src/app/shared/shared-abuse-list/abuse-details.component.html b/client/src/app/shared/shared-abuse-list/abuse-details.component.html index a1a4586f0..986de15ed 100644 --- a/client/src/app/shared/shared-abuse-list/abuse-details.component.html +++ b/client/src/app/shared/shared-abuse-list/abuse-details.component.html @@ -12,12 +12,12 @@ >
    - {{ abuse.reporterAccount.nameWithHost }} + {{ abuse.reporterAccount.nameWithHost }}
    {abuse.countReportsForReporter, plural, =1 {1 report} other {{{ abuse.countReportsForReporter }} reports}} @@ -32,12 +32,12 @@ >
    - {{ abuse.flaggedAccount ? abuse.flaggedAccount.nameWithHost : '' }} + {{ abuse.flaggedAccount ? abuse.flaggedAccount.nameWithHost : '' }}
    {abuse.countReportsForReportee, plural, =1 {1 report} other {{{ abuse.countReportsForReportee }} reports}} @@ -53,7 +53,7 @@
    Report - #{{ abuse.id }} + #{{ abuse.id }}
    diff --git a/client/src/app/shared/shared-forms/peertube-checkbox.component.html b/client/src/app/shared/shared-forms/peertube-checkbox.component.html index 9d0402224..c679e1403 100644 --- a/client/src/app/shared/shared-forms/peertube-checkbox.component.html +++ b/client/src/app/shared/shared-forms/peertube-checkbox.component.html @@ -34,7 +34,7 @@
    - + 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 83c7de9f5..0ccc23717 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 @@ -16,7 +16,7 @@ {{ item.label }}
    - {{ item.description }} + {{ item.description }}     diff --git a/client/src/app/shared/shared-forms/select/select-shared.component.scss b/client/src/app/shared/shared-forms/select/select-shared.component.scss index f7b001fe8..4de43077c 100644 --- a/client/src/app/shared/shared-forms/select/select-shared.component.scss +++ b/client/src/app/shared/shared-forms/select/select-shared.component.scss @@ -3,7 +3,7 @@ $form-base-input-width: auto; -.text-muted { +.muted { font-size: 90%; } diff --git a/client/src/app/shared/shared-main/buttons/action-dropdown.component.html b/client/src/app/shared/shared-main/buttons/action-dropdown.component.html index c465b6903..10dae68f0 100644 --- a/client/src/app/shared/shared-main/buttons/action-dropdown.component.html +++ b/client/src/app/shared/shared-main/buttons/action-dropdown.component.html @@ -20,7 +20,7 @@
    {{ action.label }} - {{ action.description }} + {{ action.description }}
    diff --git a/client/src/app/shared/shared-main/buttons/action-dropdown.component.scss b/client/src/app/shared/shared-main/buttons/action-dropdown.component.scss index b456eeb95..fe65d6e7e 100644 --- a/client/src/app/shared/shared-main/buttons/action-dropdown.component.scss +++ b/client/src/app/shared/shared-main/buttons/action-dropdown.component.scss @@ -60,7 +60,6 @@ .dropdown-item { display: flex; cursor: pointer; - color: #000 !important; &.with-icon { @include dropdown-with-icon-item; diff --git a/client/src/app/shared/shared-moderation/account-blocklist.component.html b/client/src/app/shared/shared-moderation/account-blocklist.component.html index 0143194e9..a4f81d824 100644 --- a/client/src/app/shared/shared-moderation/account-blocklist.component.html +++ b/client/src/app/shared/shared-moderation/account-blocklist.component.html @@ -36,7 +36,7 @@
    {{ accountBlock.blockedAccount.displayName }} - {{ accountBlock.blockedAccount.nameWithHost }} + {{ accountBlock.blockedAccount.nameWithHost }}
    diff --git a/client/src/app/shared/shared-tables/video-cell.component.html b/client/src/app/shared/shared-tables/video-cell.component.html index fb7d852ab..ea432b70e 100644 --- a/client/src/app/shared/shared-tables/video-cell.component.html +++ b/client/src/app/shared/shared-tables/video-cell.component.html @@ -13,7 +13,7 @@ {{ video.name }}
    -
    by {{ video.channel?.displayName }} on {{ video.channel?.host }}
    +
    by {{ video.channel?.displayName }} on {{ video.channel?.host }}
    diff --git a/client/src/app/shared/shared-video-miniature/video-filters-header.component.html b/client/src/app/shared/shared-video-miniature/video-filters-header.component.html index 9d6ef0360..7f5692dd4 100644 --- a/client/src/app/shared/shared-video-miniature/video-filters-header.component.html +++ b/client/src/app/shared/shared-video-miniature/video-filters-header.component.html @@ -1,5 +1,5 @@ -
    +
    Update your settings -- cgit v1.2.3