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

Frontend ui refactor
This commit is contained in:
daniel 2019-05-13 00:11:40 -06:00 committed by GitHub
commit 14925b2f0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 2 deletions

BIN
public/js/profile.js vendored

Binary file not shown.

Binary file not shown.

View file

@ -511,8 +511,9 @@
export default {
props: [
'profile-id',
'profile-layout',
'profile-settings',
'profile-layout'
'profile-username'
],
data() {
return {
@ -541,6 +542,10 @@ export default {
beforeMount() {
this.fetchRelationships();
this.fetchProfile();
if(window.outerWidth < 576 && window.history.length > 2) {
$('nav.navbar').hide();
$('body').prepend('<div class="bg-white p-3 border-bottom"><div class="d-flex justify-content-between align-items-center"><div onclick="window.history.back();"><i class="fas fa-chevron-left fa-lg"></i></div><div class="font-weight-bold">' + this.profileUsername + '</div><div><i class="fas fa-chevron-right text-white fa-lg"></i></div></div></div>');
}
},
mounted() {

View file

@ -7,7 +7,7 @@
</div>
@endif
<profile profile-id="{{$profile->id}}" :profile-settings="{{json_encode($settings)}}" profile-layout="{{$profile->profile_layout ?? 'metro'}}"></profile>
<profile profile-id="{{$profile->id}}" profile-username="{{$profile->username}}" :profile-settings="{{json_encode($settings)}}" profile-layout="{{$profile->profile_layout ?? 'metro'}}"></profile>
@if($profile->website)
<a class="d-none" href="{{$profile->website}}" rel="me">{{$profile->website}}</a>
@endif