From d0fbc9fd0a29c37f3ff9b99030351e90b276fe7d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 24 May 2023 15:27:15 +0200 Subject: Fix lint --- client/.eslintrc.json | 10 +- client/e2e/wdio.local-test.conf.ts | 6 +- client/e2e/wdio.local.conf.ts | 4 +- .../about-instance/about-instance.resolver.ts | 2 +- client/src/app/+accounts/accounts.component.html | 4 +- .../edit-advanced-configuration.component.html | 4 +- .../edit-basic-configuration.component.html | 18 ++-- .../edit-homepage.component.html | 2 +- .../edit-instance-information.component.html | 8 +- .../edit-live-configuration.component.html | 6 +- .../edit-vod-transcoding.component.html | 10 +- .../following-list/following-list.component.html | 4 +- .../following-list/following-list.component.scss | 4 - .../users/user-edit/user-edit.component.html | 6 +- .../users/user-list/user-list.component.html | 2 +- .../users/user-list/user-list.component.scss | 4 - client/src/app/+login/login.component.html | 6 +- client/src/app/+login/login.component.ts | 4 +- .../video-channel-create.component.ts | 6 +- .../video-channel-edit.component.html | 2 - .../video-channel-update.component.ts | 10 +- .../my-account-change-email.component.ts | 2 +- .../my-account-profile.component.ts | 8 +- .../my-video-channels.component.html | 2 +- .../my-video-channels.component.scss | 4 - .../my-history/my-history.component.html | 4 +- .../my-ownership/my-ownership.component.html | 2 +- .../my-video-channel-syncs.component.html | 2 +- .../my-video-channel-syncs.component.scss | 5 +- .../my-video-playlist-edit.component.html | 4 +- .../my-video-playlists.component.html | 2 +- .../my-video-playlists.component.scss | 4 - .../+my-library/my-videos/my-videos.component.html | 4 +- .../+reset-password/reset-password.component.ts | 2 +- .../src/app/+search/search-filters.component.html | 14 +-- client/src/app/+search/search.component.html | 6 +- .../+search/shared/abstract-lazy-load.resolver.ts | 2 +- .../+register/custom-stepper.component.html | 9 +- .../+register/custom-stepper.component.scss | 5 - .../app/+signup/+register/register.component.html | 6 +- .../app/+signup/+register/register.component.scss | 26 ++--- .../+video-channels/video-channels.component.html | 4 +- .../edit/video-studio-edit.component.html | 4 +- .../edit/video-studio-edit.component.ts | 2 +- .../+video-edit/shared/video-edit.component.html | 16 +-- .../+video-edit/shared/video-edit.component.scss | 4 - .../shared/comment/video-comments.component.html | 4 +- .../shared/comment/video-comments.component.scss | 5 - .../information/privacy-concerns.component.html | 5 +- .../information/privacy-concerns.component.scss | 23 +---- .../metadata/video-description.component.html | 14 ++- client/src/app/core/hotkeys/hotkeys.component.html | 4 +- .../src/app/header/search-typeahead.component.html | 7 +- client/src/app/menu/menu.component.html | 26 ++--- client/src/app/menu/menu.component.scss | 45 ++++----- .../app/shared/form-validators/video-validators.ts | 2 +- .../abuse-list-table.component.html | 6 +- .../actor-avatar-edit.component.html | 12 +-- .../actor-avatar-edit.component.scss | 4 + .../actor-banner-edit.component.html | 12 +-- .../actor-banner-edit.component.scss | 4 + .../shared-actor-image/actor-avatar.component.ts | 14 +-- .../shared-forms/input-switch.component.html | 6 +- .../shared-forms/preview-upload.component.html | 2 +- .../shared/shared-icons/global-icon.component.ts | 108 ++++++++++----------- .../instance-features-table.component.html | 2 +- .../instance-features-table.component.ts | 8 +- .../shared-main/angular/number-formatter.pipe.ts | 2 +- .../buttons/action-dropdown.component.html | 2 +- .../buttons/action-dropdown.component.ts | 2 +- .../shared/shared-main/buttons/button.component.ts | 2 +- .../shared-main/date/date-toggle.component.html | 3 + .../shared/shared-main/loaders/loader.component.ts | 4 +- .../users/user-notifications.component.html | 1 + .../shared-main/users/user-quota.component.html | 6 +- .../server-blocklist.component.html | 4 +- .../server-blocklist.component.scss | 4 - .../shared/shared-tables/video-cell.component.html | 2 +- .../video-thumbnail.component.html | 8 +- .../live-stream-information.component.html | 2 +- .../video-download.component.html | 6 +- .../video-filters-header.component.html | 8 +- .../shared-video-miniature/video-filters.model.ts | 2 +- .../videos-list.component.html | 4 +- .../videos-selection.component.html | 4 +- .../video-add-to-playlist.component.html | 14 +-- .../video-add-to-playlist.component.scss | 6 ++ ...video-playlist-element-miniature.component.html | 8 +- ...video-playlist-element-miniature.component.scss | 1 + .../player/shared/settings/settings-dialog.ts | 2 +- client/src/assets/player/utils.ts | 2 +- client/src/root-helpers/bytes.ts | 2 +- client/src/root-helpers/logger.ts | 2 +- client/src/root-helpers/plugins-manager.ts | 10 +- client/src/sass/class-helpers/_buttons.scss | 11 +++ client/src/sass/class-helpers/_common.scss | 6 +- client/src/sass/include/_mixins.scss | 6 -- client/src/standalone/videos/embed.html | 1 + client/src/standalone/videos/test-embed.html | 2 +- server/tests/api/live/live-save-replay.ts | 30 +++--- 100 files changed, 357 insertions(+), 390 deletions(-) diff --git a/client/.eslintrc.json b/client/.eslintrc.json index f7b207b58..a297cdc94 100644 --- a/client/.eslintrc.json +++ b/client/.eslintrc.json @@ -18,8 +18,7 @@ }, "extends": [ "../.eslintrc.json", - "plugin:@angular-eslint/ng-cli-compat", - "plugin:@angular-eslint/ng-cli-compat--formatting-add-on", + "plugin:@angular-eslint/recommended", "plugin:@angular-eslint/template/process-inline-templates" ], "rules": { @@ -155,6 +154,10 @@ "object-shorthand": [ "error", "properties" + ], + "quote-props": [ + "error", + "consistent-as-needed" ] } }, @@ -163,7 +166,8 @@ "*.html" ], "extends": [ - "plugin:@angular-eslint/template/recommended" + "plugin:@angular-eslint/template/recommended", + "plugin:@angular-eslint/template/accessibility" ], "rules": {} } diff --git a/client/e2e/wdio.local-test.conf.ts b/client/e2e/wdio.local-test.conf.ts index 3c19e4e9a..96ddc67ca 100644 --- a/client/e2e/wdio.local-test.conf.ts +++ b/client/e2e/wdio.local-test.conf.ts @@ -25,15 +25,15 @@ module.exports = { capabilities: [ { - browserName: 'chrome', - acceptInsecureCerts: true, + 'browserName': 'chrome', + 'acceptInsecureCerts': true, 'goog:chromeOptions': { args: [ '--disable-gpu', windowSizeArg ], prefs } }, { - browserName: 'firefox', + 'browserName': 'firefox', 'moz:firefoxOptions': { binary: '/usr/bin/firefox-developer-edition', args: [ '--headless', windowSizeArg ], diff --git a/client/e2e/wdio.local.conf.ts b/client/e2e/wdio.local.conf.ts index 903235b86..5cdd69290 100644 --- a/client/e2e/wdio.local.conf.ts +++ b/client/e2e/wdio.local.conf.ts @@ -20,14 +20,14 @@ module.exports = { capabilities: [ { - browserName: 'chrome', + 'browserName': 'chrome', 'goog:chromeOptions': { args: [ '--headless', '--disable-gpu', windowSizeArg ], prefs } }, { - browserName: 'firefox', + 'browserName': 'firefox', 'moz:firefoxOptions': { binary: '/usr/bin/firefox-developer-edition', args: [ '--headless', windowSizeArg ], diff --git a/client/src/app/+about/about-instance/about-instance.resolver.ts b/client/src/app/+about/about-instance/about-instance.resolver.ts index 5c09b0f46..f52a95b88 100644 --- a/client/src/app/+about/about-instance/about-instance.resolver.ts +++ b/client/src/app/+about/about-instance/about-instance.resolver.ts @@ -16,7 +16,7 @@ export type ResolverData = { } @Injectable() -export class AboutInstanceResolver { +export class AboutInstanceResolver { constructor ( private instanceService: InstanceService, diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html index 2a4985964..66d108134 100644 --- a/client/src/app/+accounts/accounts.component.html +++ b/client/src/app/+accounts/accounts.component.html @@ -48,12 +48,12 @@
-
Show more... -
+
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html index a17b13fdf..bbf946df0 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html @@ -3,7 +3,7 @@
-
CACHE
+

CACHE

Some files are not federated, and fetched when necessary. Define their caching policies.
@@ -60,7 +60,7 @@
-
CUSTOMIZATIONS
+

CUSTOMIZATIONS

Slight modifications to your PeerTube instance for when creating a plugin or theme is overkill.
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 9fc332308..50533ef73 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 @@ -1,7 +1,7 @@
-
APPEARANCE
+

APPEARANCE

Use plugins & themes for more involved changes, or add slight customizations.
@@ -91,7 +91,7 @@
-
BROADCAST MESSAGE
+

BROADCAST MESSAGE

Display a message on your instance
@@ -147,7 +147,7 @@
-
NEW USERS
+

NEW USERS

Manage users to set their quota individually.
@@ -264,7 +264,7 @@
-
VIDEOS
+

VIDEOS

@@ -350,7 +350,7 @@
-
VIDEO CHANNELS
+

VIDEO CHANNELS

@@ -372,7 +372,7 @@
-
SEARCH
+

SEARCH

@@ -461,7 +461,7 @@
-
FEDERATION
+

FEDERATION

Manage relations with other instances.
@@ -540,7 +540,7 @@
-
ADMINISTRATORS
+

ADMINISTRATORS

@@ -568,7 +568,7 @@
-
TWITTER
+

TWITTER

Provide the Twitter account representing your instance to improve link previews. If you don't have a Twitter account, just leave the default value. diff --git a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html index 3d8414f5c..fd009367f 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html @@ -4,7 +4,7 @@
-
INSTANCE HOMEPAGE
+

INSTANCE HOMEPAGE

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html index ff79ecc88..60f1aee2e 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html @@ -4,7 +4,7 @@
-
INSTANCE
+

INSTANCE

@@ -76,7 +76,7 @@
-
MODERATION & NSFW
+

MODERATION & NSFW

Manage users to build a moderation team.
@@ -154,7 +154,7 @@
-
YOU AND YOUR INSTANCE
+

YOU AND YOUR INSTANCE

@@ -204,7 +204,7 @@
-
OTHER INFORMATION
+

OTHER INFORMATION

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 e9919741f..1ba3bdfe0 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 @@ -2,7 +2,7 @@
-
LIVE
+

LIVE

Enable users of your instance to stream live.
@@ -89,7 +89,7 @@
-
TRANSCODING
+

TRANSCODING

Same as VOD transcoding, transcoding live streams so that they are in a streamable form that any device can play. Requires a beefy CPU, and then some.
@@ -111,7 +111,7 @@
- +

Output formats

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html index d3fc2e481..fb750aca6 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html @@ -18,7 +18,7 @@
-
TRANSCODING
+

TRANSCODING

Process uploaded videos so that they are in a streamable form that any device can play. Though costly in resources, this is a critical part of PeerTube, so tread carefully. @@ -38,7 +38,7 @@
- +

Input formats

- +

Output formats

@@ -108,7 +108,7 @@
- +
Resolutions to generate
-
VIDEO STUDIO
+

VIDEO STUDIO

Allows your users to edit their video (cut, add intro/outro, add a watermark etc)
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html index 1605190f6..f46f36375 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.html +++ b/client/src/app/+admin/follows/following-list/following-list.component.html @@ -20,10 +20,10 @@ > -
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.scss b/client/src/app/+admin/follows/following-list/following-list.component.scss index 0de80e563..405ddae5c 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.scss +++ b/client/src/app/+admin/follows/following-list/following-list.component.scss @@ -16,10 +16,6 @@ a { } } -.follow-button { - @include create-button; -} - my-delete-button { max-width: 130px; } diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html index ce3226857..7b3eadac2 100644 --- a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html +++ b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html @@ -219,17 +219,17 @@
- +
Send a link to reset the password by email to the user
- +
Manually set the user password
- +
This user has two factor authentication enabled
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 b7467d2cb..8c90f5a45 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 @@ -20,7 +20,7 @@ > - + Create user diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.scss b/client/src/app/+admin/overview/users/user-list/user-list.component.scss index 2a3b955d2..559a00251 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.scss +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.scss @@ -2,10 +2,6 @@ @use '_mixins' as *; @use 'bootstrap/scss/functions' as *; -.add-button { - @include create-button; -} - tr.banned > td { background-color: lighten($color: $red, $amount: 40) !important; } diff --git a/client/src/app/+login/login.component.html b/client/src/app/+login/login.component.html index 40049390e..8ccc73617 100644 --- a/client/src/app/+login/login.component.html +++ b/client/src/app/+login/login.component.html @@ -81,10 +81,12 @@
- I forgot my password + - · + · Create an account
diff --git a/client/src/app/+login/login.component.ts b/client/src/app/+login/login.component.ts index ba0d412d6..1e224db8c 100644 --- a/client/src/app/+login/login.component.ts +++ b/client/src/app/+login/login.component.ts @@ -85,8 +85,8 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni // Avoid undefined errors when accessing form error properties this.buildForm({ - username: LOGIN_USERNAME_VALIDATOR, - password: LOGIN_PASSWORD_VALIDATOR, + 'username': LOGIN_USERNAME_VALIDATOR, + 'password': LOGIN_PASSWORD_VALIDATOR, 'otp-token': { VALIDATORS: [], // Will be set dynamically MESSAGES: USER_OTP_TOKEN_VALIDATOR.MESSAGES diff --git a/client/src/app/+manage/video-channel-edit/video-channel-create.component.ts b/client/src/app/+manage/video-channel-edit/video-channel-create.component.ts index 372066890..8ca94b0b3 100644 --- a/client/src/app/+manage/video-channel-edit/video-channel-create.component.ts +++ b/client/src/app/+manage/video-channel-edit/video-channel-create.component.ts @@ -38,10 +38,10 @@ export class VideoChannelCreateComponent extends VideoChannelEdit implements OnI ngOnInit () { this.buildForm({ - name: VIDEO_CHANNEL_NAME_VALIDATOR, + 'name': VIDEO_CHANNEL_NAME_VALIDATOR, 'display-name': VIDEO_CHANNEL_DISPLAY_NAME_VALIDATOR, - description: VIDEO_CHANNEL_DESCRIPTION_VALIDATOR, - support: VIDEO_CHANNEL_SUPPORT_VALIDATOR + 'description': VIDEO_CHANNEL_DESCRIPTION_VALIDATOR, + 'support': VIDEO_CHANNEL_SUPPORT_VALIDATOR }) } diff --git a/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html b/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html index 966a350d1..58f65d994 100644 --- a/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html +++ b/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html @@ -10,8 +10,6 @@
- - { @@ -65,8 +65,8 @@ export class VideoChannelUpdateComponent extends VideoChannelEdit implements OnI this.form.patchValue({ 'display-name': videoChannelToUpdate.displayName, - description: videoChannelToUpdate.description, - support: videoChannelToUpdate.support + 'description': videoChannelToUpdate.description, + 'support': videoChannelToUpdate.support }) }, diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts index ebb7ed2da..1e8fa2a56 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts +++ b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts @@ -29,7 +29,7 @@ export class MyAccountChangeEmailComponent extends FormReactive implements OnIni ngOnInit () { this.buildForm({ 'new-email': USER_EMAIL_VALIDATOR, - password: USER_PASSWORD_VALIDATOR + 'password': USER_PASSWORD_VALIDATOR }) this.user = this.authService.getUser() diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts index 8621eb7aa..a2d128190 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts +++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts @@ -25,17 +25,17 @@ export class MyAccountProfileComponent extends FormReactive implements OnInit { ngOnInit () { this.buildForm({ - username: null, + 'username': null, 'display-name': USER_DISPLAY_NAME_REQUIRED_VALIDATOR, - description: USER_DESCRIPTION_VALIDATOR + 'description': USER_DESCRIPTION_VALIDATOR }) this.form.controls['username'].disable() this.userInformationLoaded.subscribe(() => { this.form.patchValue({ - username: this.user.username, + 'username': this.user.username, 'display-name': this.user.account.displayName, - description: this.user.account.description + 'description': this.user.account.description }) }) } 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 5bef4a6ed..0fe061983 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 @@ -18,7 +18,7 @@
- + Create video channel 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 6c5be9240..b4907db51 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 @@ -17,10 +17,6 @@ h1 { } } -.create-button { - @include create-button; -} - 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 6791dab52..1046a8f8c 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 @@ -10,8 +10,8 @@
- - + +
diff --git a/client/src/app/+reset-password/reset-password.component.ts b/client/src/app/+reset-password/reset-password.component.ts index a6c05bbfb..a99894458 100644 --- a/client/src/app/+reset-password/reset-password.component.ts +++ b/client/src/app/+reset-password/reset-password.component.ts @@ -27,7 +27,7 @@ export class ResetPasswordComponent extends FormReactive implements OnInit { ngOnInit () { this.buildForm({ - password: USER_PASSWORD_VALIDATOR, + 'password': USER_PASSWORD_VALIDATOR, 'password-confirm': RESET_PASSWORD_CONFIRM_VALIDATOR }) diff --git a/client/src/app/+search/search-filters.component.html b/client/src/app/+search/search-filters.component.html index 5bce009d5..ed0632a4d 100644 --- a/client/src/app/+search/search-filters.component.html +++ b/client/src/app/+search/search-filters.component.html @@ -4,7 +4,7 @@
- + @@ -18,7 +18,7 @@
- + @@ -37,7 +37,7 @@
- + @@ -56,7 +56,7 @@
- + @@ -105,7 +105,7 @@
- + @@ -184,7 +184,7 @@
- + @@ -209,7 +209,7 @@
- +
diff --git a/client/src/app/+search/search.component.html b/client/src/app/+search/search.component.html index 2530c87b7..fef6f8e8c 100644 --- a/client/src/app/+search/search.component.html +++ b/client/src/app/+search/search.component.html @@ -10,8 +10,8 @@ for {{ currentSearch }}
-
@@ -19,7 +19,7 @@ Filters {{ numberOfFilters() }} -
+
diff --git a/client/src/app/+search/shared/abstract-lazy-load.resolver.ts b/client/src/app/+search/shared/abstract-lazy-load.resolver.ts index 6940a7a9b..6765ba15e 100644 --- a/client/src/app/+search/shared/abstract-lazy-load.resolver.ts +++ b/client/src/app/+search/shared/abstract-lazy-load.resolver.ts @@ -4,7 +4,7 @@ import { ActivatedRouteSnapshot, Router } from '@angular/router' import { logger } from '@root-helpers/logger' import { ResultList } from '@shared/models' -export abstract class AbstractLazyLoadResolver { +export abstract class AbstractLazyLoadResolver { protected router: Router resolve (route: ActivatedRouteSnapshot) { diff --git a/client/src/app/+signup/+register/custom-stepper.component.html b/client/src/app/+signup/+register/custom-stepper.component.html index f43a46842..f2687e520 100644 --- a/client/src/app/+signup/+register/custom-stepper.component.html +++ b/client/src/app/+signup/+register/custom-stepper.component.html @@ -2,9 +2,10 @@
-
{{ i + 1 }} @@ -15,7 +16,7 @@
{{ step.label }}
-
+
diff --git a/client/src/app/+signup/+register/custom-stepper.component.scss b/client/src/app/+signup/+register/custom-stepper.component.scss index 919799716..264136b06 100644 --- a/client/src/app/+signup/+register/custom-stepper.component.scss +++ b/client/src/app/+signup/+register/custom-stepper.component.scss @@ -72,11 +72,6 @@ header { align-items: center; width: $index-block-height; opacity: 0.5; - cursor: default; - - &.c-hand { - cursor: pointer; - } &.active, &.completed { diff --git a/client/src/app/+signup/+register/register.component.html b/client/src/app/+signup/+register/register.component.html index 86763e801..71bca63e3 100644 --- a/client/src/app/+signup/+register/register.component.html +++ b/client/src/app/+signup/+register/register.component.html @@ -92,9 +92,9 @@
- +
You will be able to create a channel later
@@ -120,7 +120,7 @@ [requiresEmailVerification]="requiresEmailVerification" [requiresApproval]="requiresApproval" [instanceName]="instanceName" > -
+
diff --git a/client/src/app/+signup/+register/register.component.scss b/client/src/app/+signup/+register/register.component.scss index 9904e4ab4..ae0fdbb6e 100644 --- a/client/src/app/+signup/+register/register.component.scss +++ b/client/src/app/+signup/+register/register.component.scss @@ -44,7 +44,19 @@ my-instance-about-accordion { } } - button, + > button { + @include peertube-button-big; + + &[cdkStepperNext] { + @include orange-button; + } + + &[cdkStepperPrevious] { + @include grey-button; + } + } + + > button, .skip-step { margin-top: 20px; margin-bottom: 20px; @@ -60,18 +72,6 @@ my-instance-about-accordion { } } -button { - @include peertube-button-big; - - &[cdkStepperNext] { - @include orange-button; - } - - &[cdkStepperPrevious] { - @include grey-button; - } -} - .done-loader { display: flex; justify-content: center; diff --git a/client/src/app/+video-channels/video-channels.component.html b/client/src/app/+video-channels/video-channels.component.html index d92aa072d..fff160f2e 100644 --- a/client/src/app/+video-channels/video-channels.component.html +++ b/client/src/app/+video-channels/video-channels.component.html @@ -91,12 +91,12 @@
-
Show more... -
+
diff --git a/client/src/app/+video-studio/edit/video-studio-edit.component.html b/client/src/app/+video-studio/edit/video-studio-edit.component.html index fe74062d2..c29b12157 100644 --- a/client/src/app/+video-studio/edit/video-studio-edit.component.html +++ b/client/src/app/+video-studio/edit/video-studio-edit.component.html @@ -72,12 +72,12 @@
- +
Video before edition
- +
Edition tasks:
  1. {{ task }}
    2. diff --git a/client/src/app/+video-studio/edit/video-studio-edit.component.ts b/client/src/app/+video-studio/edit/video-studio-edit.component.ts index 94f7b5d0b..3d618fbe1 100644 --- a/client/src/app/+video-studio/edit/video-studio-edit.component.ts +++ b/client/src/app/+video-studio/edit/video-studio-edit.component.ts @@ -43,7 +43,7 @@ export class VideoStudioEditComponent extends FormReactive implements OnInit { } this.buildForm({ - cut: { + 'cut': { start: null, end: null }, diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html index b0da84979..b607dabe9 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html @@ -22,7 +22,7 @@
- + @@ -170,10 +170,10 @@
- +
@@ -187,8 +187,8 @@
Already uploaded on {{ videoCaption.updatedAt | date }} ✔
- Edit - Delete + + @@ -196,7 +196,7 @@
Will be created on update
- Cancel create + @@ -204,7 +204,7 @@
Will be edited on update
- Cancel edition + @@ -212,7 +212,7 @@
Will be deleted on update
- Cancel deletion +
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss index a8075cc6d..1c6f7f5ab 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss @@ -29,10 +29,6 @@ my-peertube-checkbox { margin-bottom: 1rem; } -.create-caption { - @include create-button; -} - .caption-entry { display: flex; height: 40px; diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html index e27942e66..a003a10eb 100644 --- a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html +++ b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html @@ -64,7 +64,7 @@ (timestampClicked)="handleTimestampClicked($event)" [redraftValue]="commentReplyRedraftValue" > -
+
+
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss index 5001ad168..7720fe43b 100644 --- a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss +++ b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss @@ -24,16 +24,11 @@ @include margin-left(5px); display: inline-block; - opacity: 0; transition: ease-in .2s opacity; width: 12px; position: relative; top: -3px; } - - &:hover my-feed { - opacity: 1; - } } #dropdown-sort-comments { diff --git a/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.html b/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.html index 7677ae836..93c4ba7a7 100644 --- a/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.html +++ b/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.html @@ -6,10 +6,11 @@ the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. + More information
-
+
+
diff --git a/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss b/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss index a6479c7ec..f7f9dfd2f 100644 --- a/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss +++ b/client/src/app/+videos/+video-watch/shared/information/privacy-concerns.component.scss @@ -50,31 +50,10 @@ a { transition: color 0.3s; &:hover { - color: #fff; + color: pvar(--mainBackgroundColor); } } -.privacy-concerns-button { - @include margin-left(auto); - - padding: 5px 8px 5px 7px; - border-radius: 3px; - white-space: nowrap; - cursor: pointer; - transition: background-color 0.3s; - font-weight: $font-semibold; - - &:hover { - background-color: #000; - } -} - -.privacy-concerns-okay { - @include margin-left(10px); - - background-color: pvar(--mainColor); -} - @media screen and (max-width: 1300px) { .privacy-concerns { font-size: 12px; diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.html b/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.html index d847daff7..9db3018e6 100644 --- a/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.html +++ b/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.html @@ -6,14 +6,20 @@ myTimestampRouteTransformer >
-
+
+ -
+
+
diff --git a/client/src/app/core/hotkeys/hotkeys.component.html b/client/src/app/core/hotkeys/hotkeys.component.html index 61f03be33..b7a6b376b 100644 --- a/client/src/app/core/hotkeys/hotkeys.component.html +++ b/client/src/app/core/hotkeys/hotkeys.component.html @@ -13,6 +13,6 @@
-
×
+
-
\ No newline at end of file +
diff --git a/client/src/app/header/search-typeahead.component.html b/client/src/app/header/search-typeahead.component.html index 783b4b53b..c5ca4b9b9 100644 --- a/client/src/app/header/search-typeahead.component.html +++ b/client/src/app/header/search-typeahead.component.html @@ -14,7 +14,8 @@