From 714f7aebad5d664f8964fae95f07808e2df2caef Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 3 Oct 2024 14:02:54 +0200 Subject: [PATCH] Cleanup sub title CSS --- .../followers-list.component.html | 10 ++-- .../following-list.component.html | 10 ++-- .../video-redundancies-list.component.html | 10 ++-- .../abuse-list/abuse-list.component.html | 10 ++-- .../registration-list.component.html | 10 ++-- .../video-block-list.component.html | 10 ++-- .../video-block-list.component.scss | 7 --- .../video-block-list.component.ts | 2 +- .../watched-words-list-admin.component.html | 10 ++-- .../video-comment-list.component.html | 12 +++-- .../video-comment-list.component.scss | 9 ---- .../comments/video-comment-list.component.ts | 1 - .../users/user-list/user-list.component.html | 10 ++-- .../users/user-list/user-list.component.scss | 9 ++-- .../overview/videos/video-list.component.html | 10 ++-- .../+admin/system/debug/debug.component.html | 37 +++++++------ .../+admin/system/debug/debug.component.ts | 6 ++- .../+admin/system/jobs/jobs.component.html | 10 ++-- .../+admin/system/jobs/jobs.component.scss | 2 +- .../+admin/system/logs/logs.component.html | 10 ++-- .../runner-job-list.component.html | 22 ++++---- .../runner-list/runner-list.component.html | 18 ++++--- ...ner-registration-token-list.component.html | 8 +-- .../my-account-abuses-list.component.html | 10 ++-- .../my-account-applications.component.html | 10 ++-- ...y-account-auto-tag-policies.component.html | 10 ++-- .../comments-on-my-videos.component.html | 10 ++-- .../my-account-import-export.component.html | 10 ++-- .../my-account-notifications.component.html | 7 ++- .../my-account-two-factor.component.html | 10 ++-- ...-account-watched-words-list.component.html | 10 ++-- .../my-video-channels.component.html | 14 ++--- .../my-video-channels.component.scss | 16 ++---- .../my-follows/my-followers.component.html | 11 ++-- .../my-subscriptions.component.html | 12 ++--- .../my-subscriptions.component.scss | 5 -- .../my-history/my-history.component.html | 12 +++-- .../my-ownership/my-ownership.component.html | 10 ++-- .../my-video-channel-syncs.component.html | 10 ++-- .../my-video-imports.component.html | 20 +++---- .../my-video-imports.component.scss | 8 +-- .../my-video-playlists.component.html | 12 +++-- .../my-video-playlists.component.scss | 4 -- .../my-videos/my-videos.component.html | 14 ++--- .../my-videos/my-videos.component.scss | 15 ------ .../account-blocklist.component.html | 10 ++-- .../server-blocklist.component.html | 10 ++-- client/src/sass/class-helpers/_position.scss | 19 +++++++ client/src/sass/class-helpers/index.scss | 1 + client/src/sass/include/_mixins.scss | 52 ++++++++++++++----- 50 files changed, 317 insertions(+), 258 deletions(-) delete mode 100644 client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss delete mode 100644 client/src/app/+admin/overview/comments/video-comment-list.component.scss create mode 100644 client/src/sass/class-helpers/_position.scss diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.html b/client/src/app/+admin/follows/followers-list/followers-list.component.html index 60fe38131..8bb1871dd 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.html +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.html @@ -1,7 +1,9 @@ -

- - Followers of your instance -

+
+
+ +

Followers of your instance

+
+
- - Subscriptions of your instance - +
+
+ +

Subscriptions of your instance

+
+
- - Videos redundancies - +
+
+ +

Videos redundancies

+
+
diff --git a/client/src/app/+admin/moderation/abuse-list/abuse-list.component.html b/client/src/app/+admin/moderation/abuse-list/abuse-list.component.html index a9e0931f8..660325238 100644 --- a/client/src/app/+admin/moderation/abuse-list/abuse-list.component.html +++ b/client/src/app/+admin/moderation/abuse-list/abuse-list.component.html @@ -1,6 +1,8 @@ -

- - Reports -

+
+
+ +

Reports

+
+
diff --git a/client/src/app/+admin/moderation/registration-list/registration-list.component.html b/client/src/app/+admin/moderation/registration-list/registration-list.component.html index d0926d96e..7e7a823c3 100644 --- a/client/src/app/+admin/moderation/registration-list/registration-list.component.html +++ b/client/src/app/+admin/moderation/registration-list/registration-list.component.html @@ -1,7 +1,9 @@ -

- - Registration requests -

+
+
+ +

Registration requests

+
+
- - Video blocks - +
+
+ +

Video blocks

+
+
- - Instance watched words lists - +
+
+ +

Instance watched words lists

+
+
Video name/description and comments that contain any of the watched words are automatically tagged with the name of the list. These automatic tags can be used to filter comments and videos. diff --git a/client/src/app/+admin/overview/comments/video-comment-list.component.html b/client/src/app/+admin/overview/comments/video-comment-list.component.html index 0b87f0f38..8b6a7d7db 100644 --- a/client/src/app/+admin/overview/comments/video-comment-list.component.html +++ b/client/src/app/+admin/overview/comments/video-comment-list.component.html @@ -1,9 +1,11 @@ -

- - Video comments +
+
+ +

Video comments

- -

+ +
+
This view also shows comments from muted accounts. diff --git a/client/src/app/+admin/overview/comments/video-comment-list.component.scss b/client/src/app/+admin/overview/comments/video-comment-list.component.scss deleted file mode 100644 index bd69b11f0..000000000 --- a/client/src/app/+admin/overview/comments/video-comment-list.component.scss +++ /dev/null @@ -1,9 +0,0 @@ -@use '_variables' as *; -@use '_mixins' as *; - -my-feed { - display: inline-block; - width: 15px; - - @include margin-left(5px); -} diff --git a/client/src/app/+admin/overview/comments/video-comment-list.component.ts b/client/src/app/+admin/overview/comments/video-comment-list.component.ts index 5d5e7b89d..e10573e58 100644 --- a/client/src/app/+admin/overview/comments/video-comment-list.component.ts +++ b/client/src/app/+admin/overview/comments/video-comment-list.component.ts @@ -8,7 +8,6 @@ import { VideoCommentListAdminOwnerComponent } from '../../../shared/shared-vide @Component({ selector: 'my-video-comment-list', templateUrl: './video-comment-list.component.html', - styleUrls: [ './video-comment-list.component.scss' ], standalone: true, imports: [ GlobalIconComponent, diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.html b/client/src/app/+admin/overview/users/user-list/user-list.component.html index 9e56da40f..21ec15efe 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.html +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.html @@ -1,7 +1,9 @@ -

- - Users -

+
+
+ +

Users

+
+
- - Videos - +
+
+ +

Videos

+
+
-

IP address

- -

PeerTube thinks your web browser public IP is {{ debug?.ip }}.

- -

If this is not your correct public IP, please consider fixing it because:

-
    -
  • Views may not be counted correctly (reduced compared to what they should be)
    • -
  • Anti brute force system could be overzealous
    • -
  • P2P system could not work correctly
    • -
- -

To fix it:

-

    -
  • Check the trust_proxy configuration key
    • -
+
+
+ +

Debug

+
+ +

IP address

+ +

PeerTube thinks your web browser public IP is {{ debug?.ip }}.

+ +

If this is not your correct public IP, please consider fixing it because:

+
    +
  • Views may not be counted correctly (reduced compared to what they should be)
    • +
  • Anti brute force system could be overzealous
    • +
  • P2P system could not work correctly
    • +
+ +

To fix it:

+

    +
  • Check the trust_proxy configuration key
    • +
diff --git a/client/src/app/+admin/system/debug/debug.component.ts b/client/src/app/+admin/system/debug/debug.component.ts index dc29f1bbc..0b800b561 100644 --- a/client/src/app/+admin/system/debug/debug.component.ts +++ b/client/src/app/+admin/system/debug/debug.component.ts @@ -2,11 +2,15 @@ import { Component, OnInit } from '@angular/core' import { Notifier } from '@app/core' import { Debug } from '@peertube/peertube-models' import { DebugService } from './debug.service' +import { GlobalIconComponent } from '@app/shared/shared-icons/global-icon.component' @Component({ templateUrl: './debug.component.html', styleUrls: [ './debug.component.scss' ], - standalone: true + standalone: true, + imports: [ + GlobalIconComponent + ] }) export class DebugComponent implements OnInit { debug: Debug diff --git a/client/src/app/+admin/system/jobs/jobs.component.html b/client/src/app/+admin/system/jobs/jobs.component.html index 40017cf1e..2c343eb94 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.html +++ b/client/src/app/+admin/system/jobs/jobs.component.html @@ -1,7 +1,9 @@ -

- - Local jobs -

+
+
+ +

Local jobs

+
+
diff --git a/client/src/app/+admin/system/jobs/jobs.component.scss b/client/src/app/+admin/system/jobs/jobs.component.scss index 94a5fd53a..5b16c1a98 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.scss +++ b/client/src/app/+admin/system/jobs/jobs.component.scss @@ -59,5 +59,5 @@ pre { } .job-error { - color: #ff0000; + color: pvar(--red); } diff --git a/client/src/app/+admin/system/logs/logs.component.html b/client/src/app/+admin/system/logs/logs.component.html index 28e8fde26..dee0fe5f5 100644 --- a/client/src/app/+admin/system/logs/logs.component.html +++ b/client/src/app/+admin/system/logs/logs.component.html @@ -1,7 +1,9 @@ -

- - Logs -

+
+
+ +

Logs

+
+
diff --git a/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.html b/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.html index ae383f1d3..ec026025b 100644 --- a/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.html +++ b/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.html @@ -1,14 +1,16 @@ -

- - - Runner jobs - +
+
+ +

Runner jobs

+
- - - Remote runners - -

+ +
- +
+ - Remote runners +

Remote runners

 - - - Runner registration tokens - - + +
- +
+ - Runner registration tokens +

Runner registration tokens
@@ -10,7 +10,7 @@ Remote runners
- +
- - Reports - +
+
+ +

Reports

+
+
diff --git a/client/src/app/+my-account/my-account-applications/my-account-applications.component.html b/client/src/app/+my-account/my-account-applications/my-account-applications.component.html index 355048881..63d3fae20 100644 --- a/client/src/app/+my-account/my-account-applications/my-account-applications.component.html +++ b/client/src/app/+my-account/my-account-applications/my-account-applications.component.html @@ -1,7 +1,9 @@ -

- - Applications -

+
+
+ +

Applications

+
+
diff --git a/client/src/app/+my-account/my-account-auto-tag-policies/my-account-auto-tag-policies.component.html b/client/src/app/+my-account/my-account-auto-tag-policies/my-account-auto-tag-policies.component.html index 8aa15f872..d1c6c0712 100644 --- a/client/src/app/+my-account/my-account-auto-tag-policies/my-account-auto-tag-policies.component.html +++ b/client/src/app/+my-account/my-account-auto-tag-policies/my-account-auto-tag-policies.component.html @@ -1,7 +1,9 @@ -

- - Your automatic tag policies -

+
+
+ +

Your automatic tag policies

+
+
Automatically block comments: diff --git a/client/src/app/+my-account/my-account-comments-on-my-videos/comments-on-my-videos.component.html b/client/src/app/+my-account/my-account-comments-on-my-videos/comments-on-my-videos.component.html index 265767cb8..597acee17 100644 --- a/client/src/app/+my-account/my-account-comments-on-my-videos/comments-on-my-videos.component.html +++ b/client/src/app/+my-account/my-account-comments-on-my-videos/comments-on-my-videos.component.html @@ -1,7 +1,9 @@ -

- - Comments on your videos -

+
+
+ +

Comments on your videos

+
+
diff --git a/client/src/app/+my-account/my-account-import-export/my-account-import-export.component.html b/client/src/app/+my-account/my-account-import-export/my-account-import-export.component.html index c4c0c9c53..aefcddf3a 100644 --- a/client/src/app/+my-account/my-account-import-export/my-account-import-export.component.html +++ b/client/src/app/+my-account/my-account-import-export/my-account-import-export.component.html @@ -1,7 +1,9 @@ -

- - Import/Export -

+
+
+ +

Import/Export

+
+
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html index dd244ec00..dec372636 100644 --- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html +++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html @@ -1,4 +1,9 @@ -

Notifications

+
+
+ +

Notifications

+
+
diff --git a/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor.component.html b/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor.component.html index 7260916b6..eefd31501 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor.component.html @@ -1,7 +1,9 @@ -

- - Two factor authentication -

+
+
+ +

Two factor authentication

+
+
Two factor authentication is already enabled. diff --git a/client/src/app/+my-account/my-account-watched-words-list/my-account-watched-words-list.component.html b/client/src/app/+my-account/my-account-watched-words-list/my-account-watched-words-list.component.html index 132bf5a69..0f01ea565 100644 --- a/client/src/app/+my-account/my-account-watched-words-list/my-account-watched-words-list.component.html +++ b/client/src/app/+my-account/my-account-watched-words-list/my-account-watched-words-list.component.html @@ -1,7 +1,9 @@ -

- - Your watched words lists -

+
+
+ +

Your watched words lists

+
+
Comments that contain any of the watched words are automatically tagged with the name of the list. These automatic tags can be used to filter comments or automatically block them. diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html index c3f7eb42e..d4d1c0931 100644 --- a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html +++ b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html @@ -1,17 +1,17 @@ -

- +
+
- My channels - {{ this.pagination.totalItems }} - +

My channels

+ {{ pagination.totalItems }} +
-

+
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.scss b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.scss index 7034ff9bf..8367ef2dd 100644 --- a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.scss +++ b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.scss @@ -1,19 +1,9 @@ @use '_variables' as *; @use '_mixins' as *; -h1 { - display: flex; - justify-content: space-between; - - my-global-icon { - top: -4px; - } - - .button-link { - @include peertube-button-link; - @include grey-button; - @include button-with-icon(18px, 3px, -1px); - } +.sub-title my-global-icon { + position: relative; + top: -3px; } input[type=text] { 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 43d0267d4..205c2473c 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 @@ -1,10 +1,9 @@ -
-

+
+
- My followers -

- - {{ pagination.totalItems }} +

My followers

+ {{ pagination.totalItems }} +
diff --git a/client/src/app/+my-library/my-follows/my-subscriptions.component.html b/client/src/app/+my-library/my-follows/my-subscriptions.component.html index b10a95603..547eb8c73 100644 --- a/client/src/app/+my-library/my-follows/my-subscriptions.component.html +++ b/client/src/app/+my-library/my-follows/my-subscriptions.component.html @@ -1,12 +1,12 @@ -

- +
+
- My subscriptions +

My subscriptions

{{ pagination.totalItems }} - -

+
+
-
+
diff --git a/client/src/app/+my-library/my-follows/my-subscriptions.component.scss b/client/src/app/+my-library/my-follows/my-subscriptions.component.scss index 310e11cb0..ffb55abae 100644 --- a/client/src/app/+my-library/my-follows/my-subscriptions.component.scss +++ b/client/src/app/+my-library/my-follows/my-subscriptions.component.scss @@ -2,11 +2,6 @@ @use '_mixins' as *; @use '_actor' as *; -.video-subscriptions-header { - margin-bottom: 30px; - display: flex; -} - input[type=text] { @include peertube-input-text(300px); } diff --git a/client/src/app/+my-library/my-history/my-history.component.html b/client/src/app/+my-library/my-history/my-history.component.html index 7203ba529..e41a2ba2a 100644 --- a/client/src/app/+my-library/my-history/my-history.component.html +++ b/client/src/app/+my-library/my-history/my-history.component.html @@ -1,8 +1,10 @@ -

- - My watch history - {{ pagination.totalItems }} -

+
+
+ +

My watch history

+ {{ pagination.totalItems }} +
+
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 daf2dec11..e151415a6 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 @@ -1,7 +1,9 @@ -

- - My ownership changes -

+
+
+ +

My ownership changes

+
+
{{ error }} -

- - My synchronizations -

+
+
+ + My synchronizations +
+

⚠️ The instance doesn't allow channel synchronization

diff --git a/client/src/app/+my-library/my-video-imports/my-video-imports.component.html b/client/src/app/+my-library/my-video-imports/my-video-imports.component.html index 1d0671a32..2d7e603b7 100644 --- a/client/src/app/+my-library/my-video-imports/my-video-imports.component.html +++ b/client/src/app/+my-library/my-video-imports/my-video-imports.component.html @@ -1,14 +1,16 @@ -

- +
+
- My imports - +

My imports

+
- - - My synchronizations - -

+ +
diff --git a/client/src/app/+my-library/my-video-imports/my-video-imports.component.scss b/client/src/app/+my-library/my-video-imports/my-video-imports.component.scss index d9b12151e..900534052 100644 --- a/client/src/app/+my-library/my-video-imports/my-video-imports.component.scss +++ b/client/src/app/+my-library/my-video-imports/my-video-imports.component.scss @@ -6,11 +6,5 @@ pre { } .video-import-error { - color: #ff0000; -} - -.button-link { - @include peertube-button-link; - @include grey-button; - @include button-with-icon(18px, 3px, -1px); + color: pvar(--red); } diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html index 6bbbf01ca..fd326e03c 100644 --- a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html +++ b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html @@ -1,8 +1,10 @@ -

- - My playlists - {{ pagination.totalItems }} -

+
+
+ +

My playlists

+ {{ pagination.totalItems }} +
+
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.scss b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.scss index 962e2b271..b8cd35359 100644 --- a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.scss +++ b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.scss @@ -1,10 +1,6 @@ @use '_variables' as *; @use '_mixins' as *; -h1 { - display: flex; -} - input[type=text] { @include peertube-input-text(300px); } diff --git a/client/src/app/+my-library/my-videos/my-videos.component.html b/client/src/app/+my-library/my-videos/my-videos.component.html index b8092fb77..a39f88e1c 100644 --- a/client/src/app/+my-library/my-videos/my-videos.component.html +++ b/client/src/app/+my-library/my-videos/my-videos.component.html @@ -1,22 +1,22 @@ -

- +
+
- My videos +

My videos

{{ pagination.totalItems }} - +
-

+
diff --git a/client/src/app/+my-library/my-videos/my-videos.component.scss b/client/src/app/+my-library/my-videos/my-videos.component.scss index c131fc8e9..9a2af6ac9 100644 --- a/client/src/app/+my-library/my-videos/my-videos.component.scss +++ b/client/src/app/+my-library/my-videos/my-videos.component.scss @@ -10,21 +10,6 @@ input[type=text] { @include margin-left(0.5rem); } -h1 { - display: flex; - justify-content: space-between; - - .button-link { - @include peertube-button-link; - @include grey-button; - @include button-with-icon(18px, 3px, -1px); - - &:not(:last-child) { - @include margin-right(10px); - } - } -} - .action-button-delete-selection { display: inline-block; 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 951db6133..65fde65e4 100644 --- a/client/src/app/shared/shared-moderation/account-blocklist.component.html +++ b/client/src/app/shared/shared-moderation/account-blocklist.component.html @@ -1,7 +1,9 @@ -

- - Muted accounts -

+
+
+ +

Muted accounts

+
+
- - Muted servers - +
+
+ +

Muted servers

+
+
span > my-global-icon, - > my-global-icon { - width: 24px; - height: 24px; - position: relative; - top: -2px; - - @include margin-right(10px); + > * { + gap: 0.5rem; + display: flex; + align-items: center; } - .pt-badge { - vertical-align: top; + .sub-title { + &, + h1 { + font-size: 1.3rem; + } - @include margin-left(7px); + h1 { + margin: 0; + } + + > my-global-icon { + width: 24px; + height: 24px; + + svg { + vertical-align: initial; + } + } + + my-feed { + display: inline-block; + width: 15px; + + my-global-icon svg { + vertical-align: initial; + position: relative; + top: 1px; + } + } } } }