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

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-02-14 20:50:49 -07:00 committed by GitHub
commit 661917b3e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Util/Lexer/RestrictedNames.php
View file

@ -152,7 +152,11 @@ class RestrictedNames
'imgs', 'imgs',
'image', 'image',
'images', 'images',
'invite',
'invites',
'js', 'js',
'lab',
'labs',
'legal', 'legal',
'live', 'live',
'login', 'login',

BIN
public/js/timeline.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

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

@ -166,12 +166,12 @@
<a :href="profile.url"> <a :href="profile.url">
<img class="mr-3 rounded-circle box-shadow" :src="profile.avatar || '/storage/avatars/default.png'" alt="avatar" width="64px" height="64px"> <img class="mr-3 rounded-circle box-shadow" :src="profile.avatar || '/storage/avatars/default.png'" alt="avatar" width="64px" height="64px">
</a> </a>
<div class="media-body d-flex justify-content-between"> <div class="media-body d-flex justify-content-between word-break">
<div> <div>
<p class="mb-0 px-0 font-weight-bold"><a :href="profile.url" class="text-dark">&commat;{{profile.username}}</a></p> <p class="mb-0 px-0 font-weight-bold"><a :href="profile.url" class="text-dark">&commat;{{profile.username}}</a></p>
<p class="my-0 text-muted text-truncate pb-0">{{profile.display_name}}</p> <p class="my-0 text-muted pb-0">{{profile.display_name}}</p>
</div> </div>
<div> <div class="ml-2">
<a :class="[optionMenuState == true ? 'text-primary' :'text-muted']" v-on:click="toggleOptionsMenu()"><i class="fas fa-cog"></i></a> <a :class="[optionMenuState == true ? 'text-primary' :'text-muted']" v-on:click="toggleOptionsMenu()"><i class="fas fa-cog"></i></a>
</div> </div>
</div> </div>
@ -353,6 +353,9 @@
} else { } else {
window.ls.set('pixelfed-classicui-settings', this.modes); window.ls.set('pixelfed-classicui-settings', this.modes);
} }
if(cachedSettings.notify == true) {
this.fetchNotifications();
}
}); });
}, },
@ -367,7 +370,6 @@
$('.profile-card .loader').addClass('d-none'); $('.profile-card .loader').addClass('d-none');
$('.profile-card .contents').removeClass('d-none'); $('.profile-card .contents').removeClass('d-none');
$('.profile-card .card-footer').removeClass('d-none'); $('.profile-card .card-footer').removeClass('d-none');
this.fetchNotifications();
}).catch(err => { }).catch(err => {
swal( swal(
'Oops, something went wrong', 'Oops, something went wrong',