Merge pull request #141 from eai04191/feature/bootstrap-4.3.0

Bootstrap 4.3.1にアップデート

README.md

@@ -8,7 +8,7 @@ a.k.a. shikorism.net
 ## 構成
 
 - Laravel 5.5
-- Bootstrap 4.2.1
+- Bootstrap 4.3.1
 
 ## 実行環境
 

package.json

@@ -10,7 +10,7 @@
     "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
   },
   "devDependencies": {
-    "bootstrap": "^4.2.1",
+    "bootstrap": "^4.3.1",
     "cal-heatmap": "^3.3.10",
     "chart.js": "^2.7.1",
     "cross-env": "^5.2.0",

resources/assets/sass/tissue.css

@@ -7,10 +7,6 @@
     background: linear-gradient(to bottom, #f8f9fa, #fff)
 }
 
-.tis-word-wrap {
-    word-wrap: break-word;
-}
-
 .tis-contribution-graph {
     overflow-x: auto;
 }

resources/views/ejaculation/show.blade.php

@@ -63,7 +63,7 @@
                         @endif
                         <!-- note -->
                         @if (!empty($ejaculation->note))
-                            <p class="mb-0 tis-word-wrap">
+                            <p class="mb-0 text-break">
                                 {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}
                             </p>
                         @endif

resources/views/home.blade.php

@@ -54,7 +54,7 @@
                 <p class="text-secondary">最近の公開チェックインから、オカズリンク付きのものを表示しています。</p>
                 <ul class="list-group">
                     @foreach ($publicLinkedEjaculations as $ejaculation)
-                        <li class="list-group-item no-side-border pt-3 pb-3 tis-word-wrap">
+                        <li class="list-group-item no-side-border pt-3 pb-3 text-break">
                             <!-- span -->
                             <div class="d-flex justify-content-between">
                                 <h5>
@@ -85,14 +85,14 @@
                             @endif
                             <!-- note -->
                             @if (!empty($ejaculation->note))
-                                <p class="mb-0 tis-word-wrap">
+                                <p class="mb-0 text-break">
                                     {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}
                                 </p>
                             @endif
                         </li>
                     @endforeach
                     <li class="list-group-item no-side-border text-right">
-                        <a href="{{ route('timeline.public') }}">もっと見る &raquo;</a>
+                        <a href="{{ route('timeline.public') }}" class="stretched-link">もっと見る &raquo;</a>
                     </li>
                 </ul>
             @endif

resources/views/search/index.blade.php

@@ -6,7 +6,7 @@
     @else
         <ul class="list-group">
         @foreach($results as $ejaculation)
-            <li class="list-group-item border-bottom-only pt-3 pb-3 tis-word-wrap">
+            <li class="list-group-item border-bottom-only pt-3 pb-3 text-break">
                 <!-- span -->
                 <div class="d-flex justify-content-between">
                     <h5>
@@ -44,7 +44,7 @@
                 @endif
                 <!-- note -->
                 @if (!empty($ejaculation->note))
-                    <p class="mb-0 tis-word-wrap">
+                    <p class="mb-0 text-break">
                         {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}
                     </p>
                 @endif

resources/views/timeline/public.blade.php

@@ -10,7 +10,7 @@
     <div class="container-fluid">
         <div class="row mx-1">
             @foreach($ejaculations as $ejaculation)
-                <div class="col-12 col-lg-6 col-xl-4 py-3 tis-word-wrap border-top">
+                <div class="col-12 col-lg-6 col-xl-4 py-3 text-break border-top">
                     <!-- span -->
                     <div class="d-flex justify-content-between">
                         <h5>
@@ -44,7 +44,7 @@
                     @endif
                     <!-- note -->
                     @if (!empty($ejaculation->note))
-                        <p class="mb-0 tis-word-wrap">
+                        <p class="mb-0 text-break">
                             {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}
                         </p>
                     @endif

resources/views/user/profile.blade.php

@@ -34,7 +34,7 @@
 @else
     <ul class="list-group">
         @forelse ($ejaculations as $ejaculation)
-            <li class="list-group-item border-bottom-only pt-3 pb-3 tis-word-wrap">
+            <li class="list-group-item border-bottom-only pt-3 pb-3 text-break">
                 <!-- span -->
                 <div class="d-flex justify-content-between">
                     <h5>{{ $ejaculation->ejaculated_span ?? '精通' }} <a href="{{ route('checkin.show', ['id' => $ejaculation->id]) }}" class="text-muted"><small>{{ $ejaculation->before_date }}{{ !empty($ejaculation->before_date) ? ' ～ ' : '' }}{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}</small></a></h5>
@@ -69,7 +69,7 @@
                 @endif
                 <!-- note -->
                 @if (!empty($ejaculation->note))
-                    <p class="mb-0 tis-word-wrap">
+                    <p class="mb-0 text-break">
                         {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}
                     </p>
                 @endif

yarn.lock

@@ -1152,7 +1152,7 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-bootstrap@^4.2.1:
+bootstrap@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
   integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==