From c7f49971c30e99b360b940defa1c82ad92fc246c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?=
 =?UTF-8?q?=E8=A8=AA=E5=AD=90?= <d@076.ne.jp>
Date: Sat, 20 Jun 2020 11:45:44 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=81=E3=81=A1=E3=82=83=E3=81=8F=E3=81=A1?=
 =?UTF-8?q?=E3=82=83=E4=BF=AE=E6=AD=A3=E3=81=A7=E3=81=97=E3=82=87=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                               |  1 +
 resources/js/bootstrap.js                  |  6 +++
 resources/views/layouts/site.blade.php     | 45 +++++++++++-----------
 resources/views/pages/site/index.blade.php | 12 +++---
 4 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 9ede3d0..5fa9500 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "dependencies": {
         "bootstrap": "^4.5.0",
         "jquery": "^3.5.1",
+        "popper.js": "^1.16.1",
         "vue": "^2.6.11",
         "vue-draggable-resizable": "^2.2.0"
     }
diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js
index 4b43786..e957d54 100644
--- a/resources/js/bootstrap.js
+++ b/resources/js/bootstrap.js
@@ -9,6 +9,12 @@ window._ = require('lodash');
 window.Vue = require('vue');
 window.axios = require('axios');
 
+try {
+  window.$ = window.jQuery = require('jquery');
+
+  require('bootstrap');
+} catch (e) {}
+
 window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 
 Vue.component('appbar', require('./components/appbar.vue').default);
diff --git a/resources/views/layouts/site.blade.php b/resources/views/layouts/site.blade.php
index 7b079ce..4edf976 100644
--- a/resources/views/layouts/site.blade.php
+++ b/resources/views/layouts/site.blade.php
@@ -50,28 +50,27 @@
         <li class="nav-item"><a class="nav-link{{ ($_SERVER['REQUEST_URI'] == '/passman' ? ' active' : '') }}" href="#">パスマン</a></li>
       </ul>
       <ul class="navbar-nav ml-auto">
-        @if ($user)
-          <li class="nav-item dropdown">
-            <a href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle" id="userdown">
-              <img src="/{{ $user->profile->avatar }}" height="25px">
-              <span style="{{ $user->profile->name_style }}">{{ $user->profile->showname }}</span>
-            </a>
-            <ul tabindex="-1" class="dropdown-menu dropdown-menu-right" aria-labelledby="userdown">
-              <li><a role="menuitem" target="_self" href="/profile/{{ $user->id }}" class="dropdown-item">プロファイルの表示</a></li>
-              <li><a role="menuitem" target="_self" href="/profile/{{ $user->id }}" class="dropdown-item">プロファイルの編集</a></li>
-              <li><div class="dropdown-divider"></div></li>
-              <li><a role="menuitem" target="_self" href="/logout" class="dropdown-item">サインアウト</a></li>
-            </ul>
-          </li>
-        @else
-          <li class="nav-item dropdown">
-            <a href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle" id="userdown">未入会者</a>
-            <ul tabindex="-1" class="dropdown-menu dropdown-menu-right" aria-labelledby="userdown">
-              <li class="nav-item"><a target="_self" href="/login" class="nav-link">サインイン</a></li>
-              <li class="nav-item"><a target="_self" href="/register" class="nav-link">新規登録</a></li>
-            </ul>
-          </li>
-        @endif
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" id="userdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          @if ($user)
+            <img src="/{{ $user->profile->avatar }}" height="25px">
+            <span style="{{ $user->profile->name_style }}">{{ $user->profile->showname }}</span>
+          @else
+            未入会者
+          @endif
+          </a>
+          <div class="dropdown-menu dropdown-menu-right" aria-labelledby="userdown">
+          @if ($user)
+            <a href="/profile/{{ $user->id }}" class="dropdown-item">プロファイルの表示</a>
+            <a href="/profile/{{ $user->id }}" class="dropdown-item">プロファイルの編集</a>
+            <div class="dropdown-divider"></div>
+            <a href="/logout" class="dropdown-item">サインアウト</a>
+          @else
+            <a href="/login" class="dropdown-item">サインイン</a>
+            <a href="/register" class="dropdown-item">新規登録</a>
+          @endif
+          </div>
+        </li>
       </ul>
     </div>
   </nav>
@@ -92,7 +91,7 @@
       </div>
       <div class="row nomobile">
         <div class="col-md" style="padding-bottom: 32px;">
-          <div class="within">
+          <div class="within" style="background-color: #31363b;">
             <appbar />
           </div>
         </div>
diff --git a/resources/views/pages/site/index.blade.php b/resources/views/pages/site/index.blade.php
index 50b7c4b..17b9395 100644
--- a/resources/views/pages/site/index.blade.php
+++ b/resources/views/pages/site/index.blade.php
@@ -2,12 +2,14 @@
 
 @section('content')
 
-@foreach ($res as $r)
-<div class="within {{ ($r->public_status !== 0 ? ' wny' : '') }}">
-  <div class="bar {{ ($r->public_status !== 0 ? ' bny' : '') }}">
-    <a href="/blog/{{ $r->slug }}">{{ $r->title }}</a>
+<div style="border: 2px solid #3daee9; box-shadow: 0px 0px 7px 3px #1d99f3; padding: 8px; background-color: #31363b;">
+  @foreach ($res as $k => $r)
+  <div class="within {{ ($r->public_status !== 0 ? ' wny' : '') }}" style="margin: {{ ($k == 0 ? 0 : 16) }}px auto {{ ($k == count($res)-1 ? 0 : 16) }}px">
+    <div class="bar {{ ($r->public_status !== 0 ? ' bny' : '') }}">
+      <a href="/blog/{{ $r->slug }}">{{ $r->title }}</a>
+    </div>
   </div>
+  @endforeach
 </div>
-@endforeach
 
 @endsection