UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-14 02:24:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update blade views

Browse source
This commit is contained in:
Daniel Supernault 2021-01-24 14:03:55 -07:00
parent 05b7e1395f
commit 9683e846e9
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
4 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/views/admin/instances/home.blade.php
View file

@ -118,7 +118,6 @@
value: "unlisted", value: "unlisted",
}, },
cw: { cw: {
text: autocw == 0 ? "CW Media" : "Remove AutoCW",
text: autocw == 0 ? "CW Media" : "Remove AutoCW", text: autocw == 0 ? "CW Media" : "Remove AutoCW",
className: "bg-warning", className: "bg-warning",
value: "autocw", value: "autocw",

18
resources/views/layouts/app.blade.php
View file

@ -56,26 +56,24 @@
@stack('scripts') @stack('scripts')
<div class="d-block d-sm-none mt-5"></div> <div class="d-block d-sm-none mt-5"></div>
<div class="d-block d-sm-none fixed-bottom"> <div class="d-block d-sm-none fixed-bottom">
<div class="card card-body rounded-0 py-2 d-flex align-items-middle box-shadow" style="border-top:1px solid #F1F5F8"> <div class="card card-body rounded-0 py-2 box-shadow" style="border-top:1px solid #F1F5F8">
<ul class="nav nav-pills nav-fill"> <ul class="nav nav-pills nav-fill d-flex align-items-middle">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link {{request()->is('/')?'text-dark':'text-lighter'}}" href="/"><i class="fas fa-home fa-lg"></i></a> <a class="nav-link text-dark" href="/"><i class="fas fa-home fa-lg"></i></a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link {{request()->is('discover')?'text-dark':'text-lighter'}}" href="/discover"><i class="fas fa-search fa-lg"></i></a> <a class="nav-link text-dark" href="/discover"><i class="fas fa-search fa-lg"></i></a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<div class="nav-link text-primary cursor-pointer" onclick="App.util.compose.post()"> <div class="nav-link cursor-pointer text-dark" onclick="App.util.compose.post()">
<span class="border border-primary rounded p-2 bg-primary"> <i class="far fa-plus-square fa-2x"></i>
<i class="fas fa-camera fa-lg text-white" style="color:#fff !important;"></i>
</span>
</div> </div>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link {{request()->is('account/activity')?'text-dark':'text-lighter'}}" href="/account/activity"><i class="far fa-heart fa-lg"></i></a> <a class="nav-link text-dark" href="/account/activity"><i class="far fa-bell fa-lg"></i></a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-lighter" href="/i/me"><i class="far fa-user fa-lg"></i></a> <a class="nav-link text-dark" href="/i/me"><i class="far fa-user fa-lg"></i></a>
</li> </li>
</ul> </ul>
</div> </div>

10
resources/views/layouts/partial/nav.blade.php
View file

@ -39,10 +39,10 @@
</a> </a>
</li> </li>
<li class="nav-item px-md-2 d-none d-md-block"> <li class="nav-item px-md-2 d-none d-md-block">
<a class="nav-link font-weight-bold text-dark" href="/?a=co" title="Compose" data-toggle="tooltip" data-placement="bottom"> <div class="nav-link font-weight-bold text-dark cursor-pointer" title="Compose" data-toggle="tooltip" data-placement="bottom" onclick="App.util.compose.post()">
<i class="far fa-plus-square fa-lg"></i> <i class="far fa-plus-square fa-lg"></i>
<span class="sr-only">Compose</span> <span class="sr-only">Compose</span>
</a> </div>
</li> </li>
<li class="nav-item px-md-2"> <li class="nav-item px-md-2">
<a class="nav-link font-weight-bold text-dark" href="/account/direct" title="Direct" data-toggle="tooltip" data-placement="bottom"> <a class="nav-link font-weight-bold text-dark" href="/account/direct" title="Direct" data-toggle="tooltip" data-placement="bottom">
@ -52,7 +52,7 @@
</li> </li>
<li class="nav-item px-md-2 d-none d-md-block"> <li class="nav-item px-md-2 d-none d-md-block">
<a class="nav-link font-weight-bold text-dark" href="/account/activity" title="Notifications" data-toggle="tooltip" data-placement="bottom"> <a class="nav-link font-weight-bold text-dark" href="/account/activity" title="Notifications" data-toggle="tooltip" data-placement="bottom">
<i class="far fa-bell fa-lg"></i> <i class="far fa-bell fa-lg" style="vertical-align: middle;"></i>
<span class="sr-only">Notifications</span> <span class="sr-only">Notifications</span>
</a> </a>
</li> </li>
@ -64,10 +64,6 @@
</a> </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="d-block d-md-none dropdown-item font-weight-bold" href="/">
<span class="fas fa-home pr-2 text-lighter"></span>
Home
</a>
<a class="dropdown-item font-weight-bold" href="{{route('discover')}}"> <a class="dropdown-item font-weight-bold" href="{{route('discover')}}">
<span class="far fa-compass pr-2 text-lighter"></span> <span class="far fa-compass pr-2 text-lighter"></span>
{{__('navmenu.discover')}} {{__('navmenu.discover')}}

26
resources/views/status/compose.blade.php
View file

@ -2,12 +2,28 @@
@section('content') @section('content')
<div class="alert alert-info text-center rounded-0">
<div class="container"> <div class="container">
<span class="font-weight-bold">ComposeUI v3 is deprecated</span> <div class="row">
<br> <div class="col-12 col-md-6 offset-md-3 mt-md-3 px-0">
Please use the <a href="#" onclick="event.preventDefault();window.App.util.compose.post()" class="font-weight-bold">new UI</a> to compose a post. <compose-modal></compose-modal>
</div>
</div> </div>
</div> </div>
@endsection @endsection
@push('styles')
<style type="text/css">
.card {
box-shadow: none;
border: 1px solid #ddd;
}
.card .card-header .fas.fa-times {
color: #fff;
}
</style>
@endpush
@push('scripts')
<script type="text/javascript" src="{{ mix('js/compose.js') }}"></script>
<script type="text/javascript">window.App.boot()</script>
@endpush