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

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

Browse source 
Updated nav to use the same nav icons on mobile and desktop
This commit is contained in:
daniel 2019-03-17 01:29:43 -06:00 committed by GitHub
commit 679ba90f57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
@auth @auth
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto d-none d-md-block">
<form class="form-inline search-form"> <form class="form-inline search-form">
<input class="form-control mr-sm-2 search-form-input" placeholder="{{__('navmenu.search')}}" aria-label="search" autocomplete="off"> <input class="form-control mr-sm-2 search-form-input" placeholder="{{__('navmenu.search')}}" aria-label="search" autocomplete="off">
</form> </form>
@ -19,21 +19,21 @@
<li><a class="nav-link font-weight-bold text-primary" href="{{ route('login') }}" title="Login">{{ __('Login') }}</a></li> <li><a class="nav-link font-weight-bold text-primary" href="{{ route('login') }}" title="Login">{{ __('Login') }}</a></li>
<li><a class="nav-link font-weight-bold" href="{{ route('register') }}" title="Register">{{ __('Register') }}</a></li> <li><a class="nav-link font-weight-bold" href="{{ route('register') }}" title="Register">{{ __('Register') }}</a></li>
@else @else
<ul class="navbar-nav mx-auto"> <ul class="navbar-nav ml-auto">
<li class=""> <div class="d-none d-md-block">
<a class="nav-link font-weight-bold {{request()->is('/') ?'text-primary':''}}" href="/" title="Home Timeline"> <li class="nav-item px-md-2">
<span class="d-none d-md-block"> <a class="nav-link font-weight-bold {{request()->is('/') ?'text-primary':''}}" href="/" title="Home Timeline" data-toggle="tooltip" data-placement="bottom">
{{__('navmenu.home')}} <i class="fas fa-home fa-lg"></i>
</span>
</a> </a>
</li> </li>
<li> </div>
<a class="nav-link font-weight-bold {{request()->is('timeline/public') ?'text-primary':''}}" href="/timeline/public"> <div class="d-none d-md-block">
<span class="d-none d-md-block"> <li class="nav-item px-md-2">
{{__('navmenu.local')}} <a class="nav-link font-weight-bold {{request()->is('timeline/public') ?'text-primary':''}}" href="/timeline/public" title="Public Timeline" data-toggle="tooltip" data-placement="bottom">
</span> <i class="far fa-map fa-lg"></i>
</a> </a>
</li> </li>
</div>
<li class="d-block d-md-none"> <li class="d-block d-md-none">
@ -44,18 +44,18 @@
{{ __('Network') }} {{ __('Network') }}
</a> </a>
</li> --}} </li> --}}
<li class="nav-item pr-md-2"> <div class="d-none d-md-block">
<li class="nav-item px-md-2">
<a class="nav-link font-weight-bold {{request()->is('*discover*') ?'text-primary':''}}" href="{{route('discover')}}" title="Discover" data-toggle="tooltip" data-placement="bottom"> <a class="nav-link font-weight-bold {{request()->is('*discover*') ?'text-primary':''}}" href="{{route('discover')}}" title="Discover" data-toggle="tooltip" data-placement="bottom">
<span class="d-none d-md-block"> <i class="far fa-compass fa-lg"></i>
{{__('navmenu.discover')}}</i>
</span>
</a> </a>
</li> </li>
</div>
<div class="d-none d-md-block"> <div class="d-none d-md-block">
<li class="nav-item pr-md-2"> <li class="nav-item px-md-2">
<div title="Create new post" data-toggle="tooltip" data-placement="bottom"> <div title="Create new post" data-toggle="tooltip" data-placement="bottom">
<a href="{{route('compose')}}" class="nav-link" data-toggle="modal" data-target="#composeModal"> <a href="{{route('compose')}}" class="nav-link" data-toggle="modal" data-target="#composeModal">
<i class="fas fa-camera-retro fa-lg text-primary"></i> <i class="far fa-plus-square fa-lg text-dark"></i>
</a> </a>
</div> </div>
</li> </li>