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

Frontend ui refactor
pull/848/head
daniel 7 years ago committed by GitHub
commit 8a928d6099
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,12 +1,12 @@
{
"/js/activity.js": "/js/activity.js?id=7915246c3bc2b7e9770e",
"/js/app.js": "/js/app.js?id=83172b0464c4537ed42a",
"/css/app.css": "/css/app.css?id=f63e0c0ea131fe4ebadf",
"/css/appdark.css": "/css/appdark.css?id=ce87661b97cb9f4dda93",
"/css/app.css": "/css/app.css?id=e3085bd9dd0fd613bb3e",
"/css/appdark.css": "/css/appdark.css?id=866d5497a414cac274e6",
"/js/components.js": "/js/components.js?id=7b5983fe04a27eb1273c",
"/js/discover.js": "/js/discover.js?id=95091dda6723ab05dbb5",
"/js/micro.js": "/js/micro.js?id=69703f96f09e6ff04be6",
"/js/profile.js": "/js/profile.js?id=dd006b565cac9962d5ad",
"/js/status.js": "/js/status.js?id=281d075819ccc5ea794d",
"/js/timeline.js": "/js/timeline.js?id=cf161bb68f03837565d9"
"/js/timeline.js": "/js/timeline.js?id=b39c002c3f282231ef11"
}

@ -450,7 +450,12 @@
fetchNotifications() {
axios.get('/api/v1/notifications')
.then(res => {
this.notifications = res.data;
this.notifications = res.data.filter(n => {
if(n.type == 'share' && !status) {
return false;
}
return true;
});
$('.notification-card .loader').addClass('d-none');
$('.notification-card .contents').removeClass('d-none');
});

Loading…
Cancel
Save