diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2018-09-29 13:42:17 +0200 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2018-09-29 13:42:17 +0200 |
commit | f5d9558f66ba7b92c6f6ed21796e490a33149dd7 (patch) | |
tree | f30e8b56b2573faea4ceec35f478b3d35bafaf25 | |
parent | 8c2b9756f946354c09ff7b6ce5ce7fdae1d8b2b7 (diff) | |
download | PeerTube-f5d9558f66ba7b92c6f6ed21796e490a33149dd7.tar.gz PeerTube-f5d9558f66ba7b92c6f6ed21796e490a33149dd7.tar.zst PeerTube-f5d9558f66ba7b92c6f6ed21796e490a33149dd7.zip |
various display improvements
5 files changed, 7 insertions, 4 deletions
diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss index 833fda450..bfecbaba0 100644 --- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss +++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss | |||
@@ -14,6 +14,10 @@ my-actor-avatar-info { | |||
14 | @include peertube-input-group(340px); | 14 | @include peertube-input-group(340px); |
15 | } | 15 | } |
16 | 16 | ||
17 | .input-group-append { | ||
18 | height: 30px; | ||
19 | } | ||
20 | |||
17 | input[type=text] { | 21 | input[type=text] { |
18 | @include peertube-input-text(340px); | 22 | @include peertube-input-text(340px); |
19 | 23 | ||
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html index 87de874bb..958c131f7 100644 --- a/client/src/app/app.component.html +++ b/client/src/app/app.component.html | |||
@@ -29,7 +29,7 @@ | |||
29 | </div> | 29 | </div> |
30 | 30 | ||
31 | <footer class="row"> | 31 | <footer class="row"> |
32 | <a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer">PeerTube v{{ serverVersion }}</a> - | 32 | <a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer">PeerTube v{{ serverVersion }}</a> - |
33 | <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube license" target="_blank" rel="noopener noreferrer">CopyLeft 2015-2018</a> | 33 | <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube license" target="_blank" rel="noopener noreferrer">CopyLeft 2015-2018</a> |
34 | </footer> | 34 | </footer> |
35 | </div> | 35 | </div> |
diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html index 216905cf0..61a05895e 100644 --- a/client/src/app/search/search.component.html +++ b/client/src/app/search/search.component.html | |||
@@ -9,7 +9,7 @@ | |||
9 | </div> | 9 | </div> |
10 | 10 | ||
11 | <div | 11 | <div |
12 | class="results-filter-button" (click)="isSearchFilterCollapsed = !isSearchFilterCollapsed" role="button" | 12 | class="results-filter-button ml-auto" (click)="isSearchFilterCollapsed = !isSearchFilterCollapsed" role="button" |
13 | [attr.aria-expanded]="!isSearchFilterCollapsed" aria-controls="collapseBasic" | 13 | [attr.aria-expanded]="!isSearchFilterCollapsed" aria-controls="collapseBasic" |
14 | > | 14 | > |
15 | <span class="icon icon-filter"></span> | 15 | <span class="icon icon-filter"></span> |
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.html b/client/src/app/videos/+video-watch/comment/video-comments.component.html index 9919ac615..5aebd7f24 100644 --- a/client/src/app/videos/+video-watch/comment/video-comments.component.html +++ b/client/src/app/videos/+video-watch/comment/video-comments.component.html | |||
@@ -5,7 +5,7 @@ | |||
5 | </div> | 5 | </div> |
6 | <my-help | 6 | <my-help |
7 | *ngIf="video.commentsEnabled === true" helpType="custom" i18n-customHtml | 7 | *ngIf="video.commentsEnabled === true" helpType="custom" i18n-customHtml |
8 | customHtml="You can either comment on the page of your instance where this video is federated with your PeerTube account, or via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and find back the video. Direct commenting capabilities are being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/224'>#224</a>."></my-help> | 8 | customHtml="You can either comment on the page of your instance where this video is federated with your PeerTube account, or via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and find back the video."></my-help> |
9 | </div> | 9 | </div> |
10 | 10 | ||
11 | <ng-template [ngIf]="video.commentsEnabled === true"> | 11 | <ng-template [ngIf]="video.commentsEnabled === true"> |
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index e2271d7d9..2356f9837 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -244,7 +244,6 @@ label { | |||
244 | } | 244 | } |
245 | 245 | ||
246 | .inputs { | 246 | .inputs { |
247 | margin-top: 40px; | ||
248 | margin-bottom: 0; | 247 | margin-bottom: 0; |
249 | text-align: right; | 248 | text-align: right; |
250 | 249 | ||