UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-30 00:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2018-12-15 16:56:23 -07:00 committed by GitHub
commit b30f92cac5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 6 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.5.5', 'version' => '0.5.6',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

BIN
public/js/components.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

7
resources/assets/js/components/PostComponent.vue
View file

@ -11,9 +11,11 @@
background: #fff; background: #fff;
} }
.postPresenterContainer { @media(min-width: 720px) {
.postPresenterContainer {
background: #000; background: #000;
min-height: 600px; min-height: 600px;
}
} }
</style> </style>
<template> <template>
@ -51,7 +53,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-12 col-md-8 status-photo px-0 mx-0"> <div class="col-12 col-md-8 px-0 mx-0">
<div class="postPresenterLoader text-center"> <div class="postPresenterLoader text-center">
<div class="lds-ring"><div></div><div></div><div></div><div></div></div> <div class="lds-ring"><div></div><div></div><div></div><div></div></div>
</div> </div>
@ -222,6 +224,7 @@ pixelfed.presenter = {
let el = $('<img>'); let el = $('<img>');
el.attr('src', media[0]['url']); el.attr('src', media[0]['url']);
el.attr('title', media[0]['description']); el.attr('title', media[0]['description']);
el.addClass('img-fluid');
wrapper.append(el); wrapper.append(el);
if(status.sensitive == true) { if(status.sensitive == true) {
let spoilerText = status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'; let spoilerText = status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media';

4
resources/assets/js/components/Timeline.vue
View file

@ -346,8 +346,12 @@
display: flex; display: flex;
align-items: center; align-items: center;
background: #000; background: #000;
}
@media(min-width: 720px) {
.postPresenterContainer {
min-height: 600px; min-height: 600px;
} }
}
.cursor-pointer { .cursor-pointer {
cursor: pointer; cursor: pointer;
} }