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

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

Browse Source 
Bootstrap 4.3.1にアップデート
This commit is contained in:
shibafu
2019-03-10 18:33:36 +09:00
committed by GitHub
parent 1a7b6c8f3c a674195db9
commit 91ec1c391e
9 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/sass/tissue.css vendored
View File

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

2
resources/views/ejaculation/show.blade.php
View File

@@ -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

6
resources/views/home.blade.php
View File

@@ -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

4
resources/views/search/index.blade.php
View File

@@ -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

4
resources/views/timeline/public.blade.php
View File

@@ -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

4
resources/views/user/profile.blade.php
View File

@@ -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