UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 00:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1033 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-03-16 02:15:42 -06:00 committed by GitHub
commit 1206c5a5a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/pixelfed.php
View file

@ -23,7 +23,7 @@ return [
| This value is the version of your PixelFed instance. | This value is the version of your PixelFed instance.
| |
*/ */
'version' => '0.8.0rc1', 'version' => '0.8.0',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

5
resources/assets/js/components/PostComments.vue
View file

@ -17,7 +17,7 @@
<div class="postCommentsContainer d-none"> <div class="postCommentsContainer d-none">
<p class="mb-1 text-center load-more-link d-none"><a href="#" class="text-muted" v-on:click="loadMore">Load more comments</a></p> <p class="mb-1 text-center load-more-link d-none"><a href="#" class="text-muted" v-on:click="loadMore">Load more comments</a></p>
<div class="comments" data-min-id="0" data-max-id="0"> <div class="comments" data-min-id="0" data-max-id="0">
<p v-for="(reply, index) in results" class="mb-0 d-flex justify-content-between align-items-top read-more" style="overflow-y: hidden;"> <p v-for="(reply, index) in results" class="mb-1 d-flex justify-content-between align-items-top read-more" style="overflow-y: hidden;">
<span> <span>
<a class="text-dark font-weight-bold mr-1" :href="reply.account.url" v-bind:title="reply.account.username">{{truncate(reply.account.username,15)}}</a> <a class="text-dark font-weight-bold mr-1" :href="reply.account.url" v-bind:title="reply.account.username">{{truncate(reply.account.username,15)}}</a>
<span class="text-break" v-html="reply.content"></span> <span class="text-break" v-html="reply.content"></span>
@ -39,6 +39,9 @@
.text-break { .text-break {
word-break: break-all !important; word-break: break-all !important;
} }
.comments p {
margin-bottom: 0;
}
</style> </style>
<script> <script>

2
resources/lang/cs/site.php
View file

@ -5,7 +5,7 @@ return [
'about' => 'O nás', 'about' => 'O nás',
'help' => 'Nápověda', 'help' => 'Nápověda',
'language' => 'Jazyk', 'language' => 'Jazyk',
'fediverse' => 'Fediverse', 'fediverse' => 'Fedivesmír',
'opensource' => 'Otevřený zdroj', 'opensource' => 'Otevřený zdroj',
'terms' => 'Podmínky', 'terms' => 'Podmínky',
'privacy' => 'Soukromí', 'privacy' => 'Soukromí',