mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #1888 from pixelfed/staging 

Update views
This commit is contained in:
daniel 2019-12-11 01:27:19 -07:00 committed by GitHub
parent c862412c0e b94af397c9
commit 74597cb534
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 4 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/views/account/activity.blade.php
View File

@ -7,7 +7,9 @@
<div class="d-flex justify-content-between align-items-center">
<div></div>
<a href="/account/activity" class="cursor-pointer font-weight-bold text-primary">Notifications</a>
@if(request()->user()->profile->is_private)
<a href="/account/follow-requests" class="cursor-pointer font-weight-bold text-dark">Follow Requests</a>
@endif
<div></div>
</div>
</div>
@ -17,11 +19,6 @@
@endsection
@push('scripts')
<script type="text/javascript" src="{{ mix('js/compose.js') }}"></script>
<script type="text/javascript" src="{{ mix('js/activity.js') }}"></script>
<script type="text/javascript">
new Vue({
el: '#content'
});
</script>
<script type="text/javascript">window.App.boot();</script>
@endpush

1
resources/views/account/follow-requests.blade.php
View File

@ -49,6 +49,7 @@
@push('scripts')
<script type="text/javascript">
App.boot();
$(document).ready(function() {
$(document).on('click', '.request-action', function(e) {
e.preventDefault();

3
resources/views/profile/show.blade.php
View File

@ -24,9 +24,6 @@
@push('styles')
<style type="text/css">
body {
background: #fff !important;
}
.navbar {
border: none !important;
}

10
resources/views/status/show.blade.php
View File

@ -24,16 +24,6 @@
<meta property="og:video" content="{{$status->mediaUrl()}}">
@endif
@endpush
@push('styles')
<style type="text/css">
body {
background: #fff !important;
}
.navbar {
border: none !important;
}
</style>
@endpush
@push('scripts')
<script type="text/javascript" src="{{ mix('js/status.js') }}"></script>

11
resources/views/timeline/home.blade.php
View File

@ -6,17 +6,6 @@
@endsection
@push('styles')
<style type="text/css">
body {
background: #fff !important;
}
.navbar {
border: none !important;
}
</style>
@endpush
@push('scripts')
<script type="text/javascript" src="{{ mix('js/timeline.js') }}"></script>
<script type="text/javascript" src="{{ mix('js/compose.js') }}"></script>

11
resources/views/timeline/local.blade.php
View File

@ -6,17 +6,6 @@
@endsection
@push('styles')
<style type="text/css">
body {
background: #fff !important;
}
.navbar {
border: none !important;
}
</style>
@endpush
@push('scripts')
<script type="text/javascript" src="{{ mix('js/timeline.js') }}"></script>
<script type="text/javascript" src="{{ mix('js/compose.js') }}"></script>