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

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

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

File diff suppressed because one or more lines are too long

@ -8,5 +8,5 @@
"/js/micro.js": "/js/micro.js?id=69703f96f09e6ff04be6", "/js/micro.js": "/js/micro.js?id=69703f96f09e6ff04be6",
"/js/profile.js": "/js/profile.js?id=dd006b565cac9962d5ad", "/js/profile.js": "/js/profile.js?id=dd006b565cac9962d5ad",
"/js/status.js": "/js/status.js?id=281d075819ccc5ea794d", "/js/status.js": "/js/status.js?id=281d075819ccc5ea794d",
"/js/timeline.js": "/js/timeline.js?id=b39c002c3f282231ef11" "/js/timeline.js": "/js/timeline.js?id=7570d505d9ba051522f5"
} }

@ -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',

Loading…
Cancel
Save