pepepper/tissue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #108 from eai04191/feature/better-mobile-navbar

Browse Source 
モバイルのナビメニューを整える
This commit is contained in:
shibafu 2019-02-27 23:46:22 +09:00 committed by GitHub
commit 579bd3e31f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 148 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/css/tissue.css vendored
View File

@ -67,3 +67,21 @@
font-size: small;
}
}
#navbarNav > .d-lg-none > .row > div:first-of-type {
padding-left: 15px;
padding-right: 7.5px;
}
#navbarNav > .d-lg-none > .row > div {
padding-left: 7.5px;
padding-right: 15px;
}
#navbarNav > .d-lg-none > .row > .col .btn {
width: 100%;
}
#navbarAccountDropdownSp {
max-width: calc(100vw - 5em);
}

80
resources/views/layouts/base.blade.php
View File

@ -36,12 +36,34 @@
</form>
<div class="container">
<a href="{{ route('home') }}" class="navbar-brand">{{ config('app.name', 'Tissue') }}</a>
<a href="{{ route('home') }}" class="navbar-brand mr-auto">{{ config('app.name', 'Tissue') }}</a>
@auth
<div class="d-lg-none navbar-nav">
<div class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle p-2" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img src="{{ Auth::user()->getProfileImageUrl(30) }}" width="30" height="30" class="rounded d-inline-block align-top">
</a>
<div class="dropdown-menu dropdown-menu-right position-absolute" aria-labelledby="navbarDropdownMenuLink" id="navbarAccountDropdownSp">
<a href="{{ route('user.profile', ['name' => Auth::user()->name]) }}" class="dropdown-item text-truncate">
<strong>{{ Auth::user()->display_name }}</strong>
<p class="mb-0 text-muted">
<span>&commat;{{ Auth::user()->name }}</span>
</p>
</a>
<div class="dropdown-divider"></div>
<a href="{{ route('setting') }}" class="dropdown-item">設定</a>
<a href="{{ route('logout') }}" class="dropdown-item" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">ログアウト</a>
</div>
</div>
</div>
@endauth
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
@auth
<!-- PC navbar -->
<div class="d-none d-lg-flex navbar-collapse ml-3">
<ul class="navbar-nav mr-auto">
<li class="nav-item {{ stripos(Route::currentRouteName(), 'home') === 0 ? 'active' : ''}}">
<a class="nav-link" href="{{ route('home') }}">ホーム</a>
@ -88,8 +110,50 @@
</div>
</li>
</ul>
</div>
<!-- SP navbar -->
<div class="d-lg-none">
<div class="row mt-2">
<div class="col">
<a class="btn btn-outline-{{ stripos(Route::currentRouteName(), 'home') === 0 ? 'primary' : 'secondary'}}" href="{{ route('home') }}" role="button">ホーム</a>
</div>
<div class="col">
<a class="btn btn-outline-{{ stripos(Route::currentRouteName(), 'user.profile') === 0 ? 'primary' : 'secondary'}}" href="{{ route('user.profile', ['name' => Auth::user()->name]) }}" role="button">タイムライン</a>
</div>
</div>
<div class="row mt-2">
<div class="col">
<a class="btn btn-outline-{{ stripos(Route::currentRouteName(), 'user.stats') === 0 ? 'primary' : 'secondary'}}" href="{{ route('user.stats', ['name' => Auth::user()->name]) }}" role="button">グラフ</a>
</div>
<div class="col">
<a class="btn btn-outline-{{ stripos(Route::currentRouteName(), 'user.okazu') === 0 ? 'primary' : 'secondary'}}" href="{{ route('user.okazu', ['name' => Auth::user()->name]) }}" role="button">オカズ</a>
</div>
</div>
{{-- <div class="row mt-2">
<div class="col">
<a class="btn btn-outline-secondary" href="{{ route('ranking') }}">ランキング</a>
</div>
</div> --}}
<div class="row mt-2">
<form action="{{ stripos(Route::currentRouteName(), 'search') === 0 ? route(Route::currentRouteName()) : route('search') }}" class="col">
<div class="input-group">
<input type="search" name="q" class="form-control" placeholder="検索..." value="{{ stripos(Route::currentRouteName(), 'search') === 0 ? $inputs['q'] : '' }}" required>
<div class="input-group-append">
<button class="btn btn-outline-secondary" type="submit"><span class="oi oi-magnifying-glass" aria-hidden="true"></span><span class="sr-only">検索</span></button>
</div>
</div>
</form>
</div>
<div class="row mt-2">
<form class="form-inline col">
<a class="btn btn-outline-success" href="{{ route('checkin') }}">チェックイン</a>
</form>
</div>
</div>
@endauth
@guest
<!-- PC navbar -->
<div class="d-none d-lg-flex navbar-collapse">
<ul class="navbar-nav ml-auto mr-2">
<li class="nav-item">
<a href="{{ route('register') }}" class="nav-link">会員登録</a>
@ -98,6 +162,20 @@
<form class="form-inline">
<a href="{{ route('login') }}" class="btn btn-outline-secondary">ログイン</a>
</form>
</div>
<!-- SP navbar -->
<div class="d-lg-none">
<div class="row mt-2">
<div class="col">
<a class="btn btn-outline-secondary" href="{{ route('register') }}" role="button">会員登録</a>
</div>
<div class="col">
<form class="form-inline">
<a class="btn btn-outline-secondary" href="{{ route('login') }}">ログイン</a>
</form>
</div>
</div>
</div>
@endguest
</div>
</div>