diff --git a/app/Http/Controllers/Peertube/Account.php b/app/Http/Controllers/Peertube/Account.php index 09553e5..7594c99 100644 --- a/app/Http/Controllers/Peertube/Account.php +++ b/app/Http/Controllers/Peertube/Account.php @@ -36,7 +36,7 @@ class Account extends Common { return $this->ptapi_get('/api/v1/accounts/'.$id.'/video-channels?start=0&count=20&sort=-updatedAt&withStats=false'); } - public function getVideo ($id) { + function getVideo ($id) { return $this->ptapi_get('/api/v1/video-channels/'.$id.'/videos?start=0&count=5&sort=-publishedAt&nsfw=both'); } } diff --git a/app/Http/Controllers/Peertube/Watch.php b/app/Http/Controllers/Peertube/Watch.php index 87d99cb..f358427 100644 --- a/app/Http/Controllers/Peertube/Watch.php +++ b/app/Http/Controllers/Peertube/Watch.php @@ -26,7 +26,7 @@ class Watch extends Common { return $this->ptapi_get('/api/v1/videos/'.$id); } - public function getRecommend ($tags) { + function getRecommend ($tags) { $tag = ''; foreach ($tags as $t) { $tag .= 'tagsOneOf='.urlencode($t).'&'; @@ -34,7 +34,7 @@ class Watch extends Common { return $this->ptapi_get('/api/v1/search/videos?start=0&count=6&nsfw=both&'.$tag.'sort=-publishedAt&searchTarget=local'); } - public function getComment ($id) { + function getComment ($id) { return $this->ptapi_get('/api/v1/videos/'.$id.'/comment-threads'); } } diff --git a/public/css/peertube/common.css b/public/css/peertube/common.css index eb23888..72ce94a 100644 --- a/public/css/peertube/common.css +++ b/public/css/peertube/common.css @@ -106,6 +106,7 @@ input { min-width: var(--avatarSize); min-height: var(--avatarSize); } + .video-info-channel { font-weight: 600; font-size: 15px; @@ -960,7 +961,6 @@ h2 { .actor-handle { color: #dd00ee !important; } .actor-counters { color: #bb00bb !important; } .section-label { margin-bottom: 5px !important; } -.owner-description, .icon.icon-logo { display: none !important; } .view-account short { margin-top: 0px !important; } .instance-name { @@ -1349,10 +1349,7 @@ my-actor-avatar { .initial.blue { background-color: #009fd4; } -.avatar.account { - object-fit: cover; - border-radius: 50%; -} + .initial { background-color: #3c2109; color: #fff; @@ -1361,14 +1358,7 @@ my-actor-avatar { justify-content: center; font-size: var(--initialFontSize); } -.avatar { - --avatarSize: 100%; - --initialFontSize: 22px; - width: var(--avatarSize); - height: var(--avatarSize); - min-width: var(--avatarSize); - min-height: var(--avatarSize); -} + .initial { background-color: #3c2109; color: #fff; @@ -1377,14 +1367,6 @@ my-actor-avatar { justify-content: center; font-size: var(--initialFontSize); } -.avatar { - --avatarSize: 100%; - --initialFontSize: 22px; - width: var(--avatarSize); - height: var(--avatarSize); - min-width: var(--avatarSize); - min-height: var(--avatarSize); -} .root-comment .right { width: 100%; } @@ -1455,10 +1437,6 @@ p { margin-top: 0; margin-bottom: 1rem; } -p { - margin-top: 0; - margin-bottom: 1rem; -} .comment-actions { margin-bottom: 10px; display: flex; diff --git a/resources/views/theme/techsuwa/component/peertube/parts/a/links.blade.php b/resources/views/theme/techsuwa/component/peertube/parts/a/links.blade.php index 0982a54..7611542 100644 --- a/resources/views/theme/techsuwa/component/peertube/parts/a/links.blade.php +++ b/resources/views/theme/techsuwa/component/peertube/parts/a/links.blade.php @@ -2,10 +2,10 @@
- チャンネル + チャンネル - 動画 + 動画
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/w/info/comments.blade.php b/resources/views/theme/techsuwa/component/peertube/parts/w/info/comments.blade.php index ad0501e..6224a25 100644 --- a/resources/views/theme/techsuwa/component/peertube/parts/w/info/comments.blade.php +++ b/resources/views/theme/techsuwa/component/peertube/parts/w/info/comments.blade.php @@ -35,7 +35,7 @@ @else @foreach ($res['comment']->data as $k => $v) @if (!$v->isDeleted) -
+
@@ -81,7 +81,7 @@ @endif @endforeach @endif -
+