From af964ad82f54a78dc25c7c8acb9391a928c8e3e0 Mon Sep 17 00:00:00 2001
From: eai04191 <eai@mizle.net>
Date: Sat, 23 Feb 2019 05:29:12 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=E3=83=A2=E3=83=90=E3=82=A4=E3=83=AB?=
 =?UTF-8?q?=E3=81=AE=E3=83=8A=E3=83=93=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E3=82=92=E6=95=B4=E3=81=88=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#107

Preview:

https://stellaria.network/system/media_attachments/files/000/070/479/original/0991a41baca49811.png
https://stellaria.network/system/media_attachments/files/000/070/527/original/4ace1b1df83bc380.png
---
 public/css/tissue.css                  |  14 ++
 resources/views/layouts/base.blade.php | 180 ++++++++++++++++++-------
 2 files changed, 142 insertions(+), 52 deletions(-)

diff --git a/public/css/tissue.css b/public/css/tissue.css
index 7b9c578..6cbf65b 100644
--- a/public/css/tissue.css
+++ b/public/css/tissue.css
@@ -66,4 +66,18 @@
     .tis-sidebar-info {
         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%;
 }
\ No newline at end of file
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 97a4acb..7f9272b 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -36,68 +36,144 @@
     </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>
+        <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">
+                    <a href="{{ route('user.profile', ['name' => Auth::user()->name]) }}" class="dropdown-item">
+                        <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>
         <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
-                <ul class="navbar-nav mr-auto">
-                    <li class="nav-item {{ stripos(Route::currentRouteName(), 'home') === 0 ? 'active' : ''}}">
-                        <a class="nav-link" href="{{ route('home') }}">ホーム</a>
-                    </li>
-                    <li class="nav-item {{ stripos(Route::currentRouteName(), 'user.profile') === 0 ? 'active' : ''}}">
-                        <a class="nav-link" href="{{ route('user.profile', ['name' => Auth::user()->name]) }}">タイムライン</a>
-                    </li>
-                    <li class="nav-item {{ stripos(Route::currentRouteName(), 'user.stats') === 0 ? 'active' : ''}}">
-                        <a class="nav-link" href="{{ route('user.stats', ['name' => Auth::user()->name]) }}">グラフ</a>
-                    </li>
-                    <li class="nav-item {{ stripos(Route::currentRouteName(), 'user.okazu') === 0 ? 'active' : ''}}">
-                        <a class="nav-link" href="{{ route('user.okazu', ['name' => Auth::user()->name]) }}">オカズ</a>
-                    </li>
-                    {{--<li class="nav-item">
-                        <a class="nav-link" href="{{ route('ranking') }}">ランキング</a>
-                    </li>--}}
-                </ul>
-                <form action="{{ stripos(Route::currentRouteName(), 'search') === 0 ? route(Route::currentRouteName()) : route('search') }}" class="form-inline mr-2">
-                    <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>
+                <!-- 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>
+                        </li>
+                        <li class="nav-item {{ stripos(Route::currentRouteName(), 'user.profile') === 0 ? 'active' : ''}}">
+                            <a class="nav-link" href="{{ route('user.profile', ['name' => Auth::user()->name]) }}">タイムライン</a>
+                        </li>
+                        <li class="nav-item {{ stripos(Route::currentRouteName(), 'user.stats') === 0 ? 'active' : ''}}">
+                            <a class="nav-link" href="{{ route('user.stats', ['name' => Auth::user()->name]) }}">グラフ</a>
+                        </li>
+                        <li class="nav-item {{ stripos(Route::currentRouteName(), 'user.okazu') === 0 ? 'active' : ''}}">
+                            <a class="nav-link" href="{{ route('user.okazu', ['name' => Auth::user()->name]) }}">オカズ</a>
+                        </li>
+                        {{--<li class="nav-item">
+                            <a class="nav-link" href="{{ route('ranking') }}">ランキング</a>
+                        </li>--}}
+                    </ul>
+                    <form action="{{ stripos(Route::currentRouteName(), 'search') === 0 ? route(Route::currentRouteName()) : route('search') }}" class="form-inline mr-2">
+                        <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>
+                    <form class="form-inline mr-2">
+                        <a href="{{ route('checkin') }}" class="btn btn-outline-success">チェックイン</a>
+                    </form>
+                    <ul class="navbar-nav">
+                        <li class="nav-item dropdown">
+                            <a href="#" class="nav-link dropdown-toggle" 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" aria-labelledby="navbarDropdownMenuLink">
+                                <a href="{{ route('user.profile', ['name' => Auth::user()->name]) }}" class="dropdown-item">
+                                    <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>
+                        </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>
-                </form>
-                <form class="form-inline mr-2">
-                    <a href="{{ route('checkin') }}" class="btn btn-outline-success">チェックイン</a>
-                </form>
-                <ul class="navbar-nav">
-                    <li class="nav-item dropdown">
-                        <a href="#" class="nav-link dropdown-toggle" 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" aria-labelledby="navbarDropdownMenuLink">
-                            <a href="{{ route('user.profile', ['name' => Auth::user()->name]) }}" class="dropdown-item">
-                                <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 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>
-                    </li>
-                </ul>
+                        <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="form-inline 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
-                <ul class="navbar-nav ml-auto mr-2">
-                    <li class="nav-item">
-                        <a href="{{ route('register') }}" class="nav-link">会員登録</a>
-                    </li>
-                </ul>
-                <form class="form-inline">
-                    <a href="{{ route('login') }}" class="btn btn-outline-secondary">ログイン</a>
-                </form>
+                <!-- 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>
+                        </li>
+                    </ul>
+                    <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>

From de740082b75ae42c3f795d04494c5b86979642d3 Mon Sep 17 00:00:00 2001
From: eai04191 <eai@mizle.net>
Date: Sat, 23 Feb 2019 06:40:37 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA.form-inline?=
 =?UTF-8?q?=E3=81=A7=E5=B9=85=E3=81=8C=E5=88=B6=E9=99=90=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/layouts/base.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 7f9272b..5903545 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -133,7 +133,7 @@
                         </div>
                     </div> --}}
                     <div class="row mt-2">
-                        <form action="{{ stripos(Route::currentRouteName(), 'search') === 0 ? route(Route::currentRouteName()) : route('search') }}" class="form-inline col">
+                        <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">

From c9cdd267288dc7e4600d8cca1b5c1d3da9a4ab27 Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Tue, 26 Feb 2019 22:26:22 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=E9=9D=9E=E3=83=AD=E3=82=B0=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E6=99=82=E3=81=AB=E3=81=AF=E3=82=A2=E3=82=AB=E3=82=A6?=
 =?UTF-8?q?=E3=83=B3=E3=83=88=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9B=E3=81=97=E3=81=AA=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ログイン情報がないのに参照してコケていた
---
 resources/views/layouts/base.blade.php | 32 ++++++++++++++------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 5903545..6eeda23 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -37,24 +37,26 @@
 
     <div class="container">
         <a href="{{ route('home') }}" class="navbar-brand mr-auto">{{ config('app.name', 'Tissue') }}</a>
-        <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">
-                    <a href="{{ route('user.profile', ['name' => Auth::user()->name]) }}" class="dropdown-item">
-                        <strong>{{ Auth::user()->display_name }}</strong>
-                        <p class="mb-0 text-muted">
-                            <span>&commat;{{ Auth::user()->name }}</span>
-                        </p>
+        @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-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 class="dropdown-menu dropdown-menu-right position-absolute" aria-labelledby="navbarDropdownMenuLink">
+                        <a href="{{ route('user.profile', ['name' => Auth::user()->name]) }}" class="dropdown-item">
+                            <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>
-        </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>

From be6151f0c784ae4479ade6550bde627ec06607fe Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Tue, 26 Feb 2019 22:32:32 +0900
Subject: [PATCH 4/4] =?UTF-8?q?SP=E8=A1=A8=E7=A4=BA=E3=81=AE=E3=82=A2?=
 =?UTF-8?q?=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88=E3=83=A1=E3=83=8B=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E3=81=8C=E7=94=BB=E9=9D=A2=E5=A4=96=E3=81=AB=E7=AA=81?=
 =?UTF-8?q?=E3=81=8D=E6=8A=9C=E3=81=91=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/tissue.css                  | 4 ++++
 resources/views/layouts/base.blade.php | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/css/tissue.css b/public/css/tissue.css
index 6cbf65b..2bdf2fd 100644
--- a/public/css/tissue.css
+++ b/public/css/tissue.css
@@ -80,4 +80,8 @@
 
 #navbarNav > .d-lg-none > .row > .col .btn {
     width: 100%;
+}
+
+#navbarAccountDropdownSp {
+    max-width: calc(100vw - 5em);
 }
\ No newline at end of file
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 6eeda23..6367385 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -43,8 +43,8 @@
                     <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">
-                        <a href="{{ route('user.profile', ['name' => Auth::user()->name]) }}" class="dropdown-item">
+                    <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>