From c9e3565dc8d0e5ce0dcbdb4fe8deb7a257d9e2a0 Mon Sep 17 00:00:00 2001 From: Caroline Chuong Date: Sat, 13 Jun 2020 00:53:56 +0200 Subject: [PATCH] fix headings order or add missing ones (#2871) Co-authored-by: Rigel Kent --- .../about-follows.component.html | 5 ++- .../about-instance.component.html | 41 ++++++++++--------- .../contact-admin-modal.component.html | 4 +- .../about-peertube.component.html | 24 +++++------ .../about-peertube.component.scss | 8 ++++ .../account-about.component.html | 5 ++- .../account-video-channels.component.html | 3 +- .../edit-custom-config.component.html | 1 + .../app/+admin/follows/follows.component.html | 2 +- .../moderation/moderation.component.html | 2 +- .../app/+admin/plugins/plugins.component.html | 2 +- .../app/+admin/system/system.component.html | 2 +- .../users/user-list/user-list.component.html | 2 +- .../my-account-blocklist.component.html | 2 +- ...my-account-server-blocklist.component.html | 2 +- .../my-account-history.component.html | 1 + .../my-account-notifications.component.html | 1 + ...my-account-accept-ownership.component.html | 2 +- .../my-account-ownership.component.html | 1 + .../my-account-settings.component.html | 15 +++---- .../my-account-subscriptions.component.html | 1 + .../my-account-video-channels.component.html | 1 + .../my-account-video-imports.component.html | 1 + .../my-account-video-playlists.component.html | 2 +- .../my-account-video-playlists.component.scss | 4 ++ .../my-account-videos.component.html | 2 +- .../my-account-videos.component.scss | 3 +- .../shared/actor-avatar-info.component.html | 1 + .../instance-statistics.component.html | 4 +- .../instance-statistics.component.scss | 5 +++ .../app/shared/video/abstract-video-list.html | 8 ++-- .../comment/video-comments.component.html | 4 +- .../recommended-videos.component.html | 4 +- .../video-list/video-overview.component.html | 11 ++--- client/src/sass/include/_miniature.scss | 5 ++- 35 files changed, 108 insertions(+), 73 deletions(-) diff --git a/client/src/app/+about/about-follows/about-follows.component.html b/client/src/app/+about/about-follows/about-follows.component.html index ebe03bd94..dd50cda74 100644 --- a/client/src/app/+about/about-follows/about-follows.component.html +++ b/client/src/app/+about/about-follows/about-follows.component.html @@ -1,6 +1,7 @@
+

Follows

-
Followers instances
+

Followers instances

This instance does not have instances followers.
@@ -10,7 +11,7 @@
-
Followings instances
+

Followings instances

This instance does not have instances followings.
diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html index 7ba2d9ac8..3bc63b7d1 100644 --- a/client/src/app/+about/about-instance/about-instance.component.html +++ b/client/src/app/+about/about-instance/about-instance.component.html @@ -2,9 +2,9 @@
-
About {{ instanceName }}
+

About {{ instanceName }}

-
Contact administrator
+
@@ -19,84 +19,85 @@
This instance is dedicated to sensitive/NSFW content.
-
+

ADMINISTRATORS & SUSTAINABILITY -

+
-
Who we are
+

Who we are

-
Why we created this instance
+

Why we created this instance

{{ creationReason }}

-
How long we plan to maintain this instance
+

How long we plan to maintain this instance

{{ maintenanceLifetime }}

-
How we will pay for this instance
+

How we will pay for this instance

{{ businessModel }}

-
+

INFORMATION -

+
-
Description
+

Description

-
+

MODERATION -

+
-
Moderation information
+

Moderation information

-
Code of conduct
+

Code of conduct

-
Terms
+

Terms

-
+

OTHER INFORMATION -

+
-
Hardware information
+

Hardware information

+

FEATURES

-
STATISTICS
+

STATISTICS

diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.html b/client/src/app/+about/about-instance/contact-admin-modal.component.html index 7d93796ec..81e59d46a 100644 --- a/client/src/app/+about/about-instance/contact-admin-modal.component.html +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.html @@ -1,7 +1,7 @@
-

Contact {{ instanceName }} administrator

- +

Contact {{ instanceName }} administrator

+
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html index 1dbad3096..93670fe4e 100644 --- a/client/src/app/+about/about-peertube/about-peertube.component.html +++ b/client/src/app/+about/about-peertube/about-peertube.component.html @@ -24,10 +24,10 @@
-
+
Use PeerTube documentation -
+
Discover how to setup your account, what is a channel, how to create a playlist and more! @@ -37,10 +37,10 @@
-
+
PeerTube Applications -
+
Discover unofficial Android applications or browser addons! @@ -50,10 +50,10 @@
-
+
Contribute on PeerTube -
+
Want to help to improve PeerTube? You can translate the web interface, give your feedback or directly contribute to the code! @@ -66,10 +66,10 @@
-

+

P2P & Privacy -

+

PeerTube uses the BitTorrent protocol to share bandwidth between users by default to help lower the load on the server, @@ -82,7 +82,7 @@ tracker as long as you download or watch the video.

-
What are the consequences?
+

What are the consequences?

In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video. @@ -128,7 +128,7 @@ There are much more effective ways to get that kind of information.

-
How does PeerTube compare with YouTube?
+

How does PeerTube compare with YouTube?

The threats to privacy with YouTube are different from PeerTube's. @@ -136,7 +136,7 @@ Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics).

-
What can I do to limit the exposure of my IP address?
+

What can I do to limit the exposure of my IP address?

Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing @@ -145,7 +145,7 @@ Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense.

-
What will be done to mitigate this problem?
+

What will be done to mitigate this problem?

PeerTube wants to deliver the best countermeasures possible, to give you more choice diff --git a/client/src/app/+about/about-peertube/about-peertube.component.scss b/client/src/app/+about/about-peertube/about-peertube.component.scss index a43eb6fe1..4856d4ae5 100644 --- a/client/src/app/+about/about-peertube/about-peertube.component.scss +++ b/client/src/app/+about/about-peertube/about-peertube.component.scss @@ -67,3 +67,11 @@ my-about-peertube-contributors { } } } + +.card-title { + font-size: 1.25rem; +} + +.p2p-privacy-title { + font-size: 20px; +} diff --git a/client/src/app/+accounts/account-about/account-about.component.html b/client/src/app/+accounts/account-about/account-about.component.html index 1f1987aba..e9e0e4079 100644 --- a/client/src/app/+accounts/account-about/account-about.component.html +++ b/client/src/app/+accounts/account-about/account-about.component.html @@ -1,12 +1,13 @@ +

About

-
DESCRIPTION
+

DESCRIPTION

-
STATS
+

STATS

Joined {{ account.createdAt | date }}
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html index 8f1ff21a5..73bac5f1d 100644 --- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html +++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html @@ -1,3 +1,4 @@ +

Video channels

This account does not have channels.
@@ -8,7 +9,7 @@ Avatar -
{{ videoChannel.displayName }}
+

{{ videoChannel.displayName }}

{videoChannel.followersCount, plural, =1 {1 subscriber} other {{{ videoChannel.followersCount }} subscribers}}
 diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index 716d12685..44de716a3 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html @@ -1,3 +1,4 @@ +

Configuration

diff --git a/client/src/app/+admin/follows/follows.component.html b/client/src/app/+admin/follows/follows.component.html index 7b5bcc2db..8c3129394 100644 --- a/client/src/app/+admin/follows/follows.component.html +++ b/client/src/app/+admin/follows/follows.component.html @@ -1,5 +1,5 @@
-
Follows & redundancies
+

Follows & redundancies

Following diff --git a/client/src/app/+admin/moderation/moderation.component.html b/client/src/app/+admin/moderation/moderation.component.html index 09f149c0e..7bab63c33 100644 --- a/client/src/app/+admin/moderation/moderation.component.html +++ b/client/src/app/+admin/moderation/moderation.component.html @@ -1,5 +1,5 @@
-
Moderation
+

Moderation

Video reports diff --git a/client/src/app/+admin/plugins/plugins.component.html b/client/src/app/+admin/plugins/plugins.component.html index 3dc4939da..e2b927db8 100644 --- a/client/src/app/+admin/plugins/plugins.component.html +++ b/client/src/app/+admin/plugins/plugins.component.html @@ -1,5 +1,5 @@
-
Plugins/Themes
+

Plugins/Themes

Installed diff --git a/client/src/app/+admin/system/system.component.html b/client/src/app/+admin/system/system.component.html index 7c4278d35..4f9521c0c 100644 --- a/client/src/app/+admin/system/system.component.html +++ b/client/src/app/+admin/system/system.component.html @@ -1,5 +1,5 @@
-
System
+

System

Jobs diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html index 6c6c64194..e0022d2ba 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.html +++ b/client/src/app/+admin/users/user-list/user-list.component.html @@ -1,5 +1,5 @@
-
Users list
+

Users list

diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.html b/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.html index fb9e6546e..90f657521 100644 --- a/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.html +++ b/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.html @@ -1,5 +1,5 @@
-
Muted accounts
+

Muted accounts

-
Muted instances
+

Muted instances

History
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 429943f71..8e4480ca6 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,3 +1,4 @@ +

Notifications

diff --git a/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html b/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html index a155d90e0..222da9542 100644 --- a/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html +++ b/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html @@ -1,6 +1,6 @@
-

Accept ownership

+

Accept ownership

diff --git a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html index 354176a11..a50acfdf8 100644 --- a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html +++ b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html @@ -1,3 +1,4 @@ +

Ownership changes

Settings
- +
@@ -29,7 +30,7 @@
- +
@@ -40,7 +41,7 @@
- +
@@ -50,7 +51,7 @@
- +
@@ -60,7 +61,7 @@
- +
@@ -70,7 +71,7 @@
- +
@@ -80,7 +81,7 @@
- +
diff --git a/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html b/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html index b87a4c00c..23dfdc8f5 100644 --- a/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html +++ b/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html @@ -1,3 +1,4 @@ +

Subscriptions

You don't have any subscriptions yet.
diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html index 6fd94474d..2499b6ed5 100644 --- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html +++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html @@ -1,3 +1,4 @@ +

My channels

diff --git a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html index 37c6ad6b4..8f0786bd0 100644 --- a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html +++ b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html @@ -1,3 +1,4 @@ +

Imports

-

Playlists {{ pagination.totalItems }}

+

Playlists {{ pagination.totalItems }}

diff --git a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.scss b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.scss index 4381d74b0..41e7851fd 100644 --- a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.scss +++ b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.scss @@ -41,6 +41,10 @@ input[type=text] { @include peertube-input-text(300px); } + + h1 { + font-size: 1.5rem; + } } @media screen and (max-width: $small-view) { diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html index 9192aec6d..825bddf5e 100644 --- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html +++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html @@ -1,5 +1,5 @@
-

Videos {{ pagination.totalItems }}

+

Videos {{ pagination.totalItems }}

diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss b/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss index 67a58d8d5..18c1ae288 100644 --- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss +++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss @@ -6,9 +6,10 @@ justify-content: space-between; margin: 20px 0 50px; - h4, + h1, .fake-element { flex: 1; + font-size: 1.5rem; } input[type=text] { diff --git a/client/src/app/+my-account/shared/actor-avatar-info.component.html b/client/src/app/+my-account/shared/actor-avatar-info.component.html index 82f5123de..d01b9ac7f 100644 --- a/client/src/app/+my-account/shared/actor-avatar-info.component.html +++ b/client/src/app/+my-account/shared/actor-avatar-info.component.html @@ -6,6 +6,7 @@
+
diff --git a/client/src/app/shared/instance/instance-statistics.component.html b/client/src/app/shared/instance/instance-statistics.component.html index bcb2308fe..399cf10fe 100644 --- a/client/src/app/shared/instance/instance-statistics.component.html +++ b/client/src/app/shared/instance/instance-statistics.component.html @@ -1,7 +1,7 @@

Loading instance statistics...

-
Local
+

Local

@@ -55,7 +55,7 @@
-
Federation
+

Federation

diff --git a/client/src/app/shared/instance/instance-statistics.component.scss b/client/src/app/shared/instance/instance-statistics.component.scss index 63f8911f6..5286ab03a 100644 --- a/client/src/app/shared/instance/instance-statistics.component.scss +++ b/client/src/app/shared/instance/instance-statistics.component.scss @@ -1,3 +1,8 @@ + +h3 { + font-size: 1.25rem; +} + .stat { text-align: center; margin-bottom: 1em; diff --git a/client/src/app/shared/video/abstract-video-list.html b/client/src/app/shared/video/abstract-video-list.html index 54557df6b..548370843 100644 --- a/client/src/app/shared/video/abstract-video-list.html +++ b/client/src/app/shared/video/abstract-video-list.html @@ -1,11 +1,11 @@
-
+

{{ titlePage }}
-

+
@@ -31,9 +31,9 @@ class="videos" > -
+

{{ getCurrentGroupedDateLabel(video) }} -

+
-
+

1 Comment {{ componentPagination.totalItems }} Comments Comments -

+ diff --git a/client/src/app/videos/recommendations/recommended-videos.component.html b/client/src/app/videos/recommendations/recommended-videos.component.html index a40266028..17e19c083 100644 --- a/client/src/app/videos/recommendations/recommended-videos.component.html +++ b/client/src/app/videos/recommendations/recommended-videos.component.html @@ -1,9 +1,9 @@
-
+

Other videos -

+
diff --git a/client/src/app/videos/video-list/video-overview.component.html b/client/src/app/videos/video-list/video-overview.component.html index 999628de4..19d03b5c5 100644 --- a/client/src/app/videos/video-list/video-overview.component.html +++ b/client/src/app/videos/video-list/video-overview.component.html @@ -1,3 +1,4 @@ +

Discover

No results.
@@ -8,9 +9,9 @@
-
+

{{ object.category.label }} -

+
@@ -19,9 +20,9 @@
-
+

#{{ object.tag }} -

+
@@ -34,7 +35,7 @@ Avatar -
{{ object.channel.displayName }}
+

{{ object.channel.displayName }}
diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scss index d82d78d58..976bbf4d6 100644 --- a/client/src/sass/include/_miniature.scss +++ b/client/src/sass/include/_miniature.scss @@ -124,7 +124,10 @@ $play-overlay-width: 18px; margin-bottom: 15px; display: flex; justify-content: space-between; - border-top: 1px solid $separator-border-color; + + &:not(h2) { + border-top: 1px solid $separator-border-color; + } a { &:hover, &:focus:not(.focus-visible), &:active { -- 2.41.0