UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-03 10:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Update mobile nav
This commit is contained in:
daniel 2019-03-10 00:13:44 -07:00 committed by GitHub
commit a2f4bdc061
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,8 +39,24 @@
@if(Auth::check()) @if(Auth::check())
<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="float-right m-3"> <div class="card card-body rounded-0 py-2 d-flex align-middle">
<button class="bg-primary rounded-circle text-white box-shadow border-0" data-toggle="modal" data-target="#composeModal" style="width:60px;height: 60px;"><i class="fas fa-plus fa-lg mb-0"></i></button> <ul class="nav nav-pills nav-fill">
<li class="nav-item">
<a class="nav-link text-muted" href="/"><i class="fas fa-home fa-lg"></i></a>
</li>
<li class="nav-item">
<a class="nav-link text-muted" href="/timeline/public"><i class="far fa-map fa-lg"></i></a>
</li>
<li class="nav-item">
<a class="nav-link text-primary" data-toggle="modal" data-target="#composeModal"><i class="fas fa-camera-retro fa-2x"></i></a>
</li>
<li class="nav-item">
<a class="nav-link text-muted" href="{{route('discover')}}"><i class="far fa-compass fa-lg"></i></a>
</li>
<li class="nav-item">
<a class="nav-link text-muted" href="{{Auth::user()->url()}}"><i class="far fa-user fa-lg"></i></a>
</li>
</ul>
</div> </div>
</div> </div>
<div class="modal" tabindex="-1" role="dialog" id="composeModal"> <div class="modal" tabindex="-1" role="dialog" id="composeModal">

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

@ -22,9 +22,6 @@
<ul class="navbar-nav mx-auto"> <ul class="navbar-nav mx-auto">
<li class=""> <li class="">
<a class="nav-link font-weight-bold {{request()->is('/') ?'text-primary':''}}" href="/" title="Home Timeline"> <a class="nav-link font-weight-bold {{request()->is('/') ?'text-primary':''}}" href="/" title="Home Timeline">
<span class="d-block d-md-none mr-1" data-toggle="tooltip" title="Home Timeline">
<i class="fas fa-home fa-lg"></i>
</span>
<span class="d-none d-md-block"> <span class="d-none d-md-block">
{{__('navmenu.home')}} {{__('navmenu.home')}}
</span> </span>
@ -32,16 +29,14 @@
</li> </li>
<li> <li>
<a class="nav-link font-weight-bold {{request()->is('timeline/public') ?'text-primary':''}}" href="/timeline/public"> <a class="nav-link font-weight-bold {{request()->is('timeline/public') ?'text-primary':''}}" href="/timeline/public">
<span class="d-block d-md-none mx-2" data-toggle="tooltip" title="Local Timeline">
<i class="far fa-map fa-lg"></i>
</span>
<span class="d-none d-md-block"> <span class="d-none d-md-block">
{{__('navmenu.local')}} {{__('navmenu.local')}}
</span> </span>
</a> </a>
</li> </li>
<li class="d-block d-md-none"> <li class="d-block d-md-none">
<a class="nav-link ml-1" href="/account/activity" data-toggle="tooltip" title="Notifications"> <a class="nav-link" href="/account/activity" data-toggle="tooltip" title="Notifications">
<i class="far fa-bell fa-lg"></i> <i class="far fa-bell fa-lg"></i>
</a> </a>
</li> </li>