Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

名前の長いタグがチェックインのコンテナ外にはみ出ないようにする #733

Merged
merged 4 commits into from
Nov 8, 2021
Merged

名前の長いタグがチェックインのコンテナ外にはみ出ないようにする #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b7656e
名前の長いタグがチェックインのコンテナ外にはみ出ないようにする
shibafu528 Aug 5, 2021
eb58dd0
ボタンからはみ出る文字「ﾊﾐｯ…ﾊﾐｯ…」
shibafu528 Aug 5, 2021
cb44eb2
breaking change
shibafu528 Aug 5, 2021
f7820eb
Merge branch 'develop' into fix/709-checkin-tag-word-break
shibafu528 Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions resources/assets/sass/components/_ejaculation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,22 @@
background-color: rgba(240, 240, 240, 0.8);
border-radius: 5px;
}

.tis-checkin-tags {
display: flex;
flex-wrap: wrap;
gap: .6ch;

& > .badge {
max-width: 100%;
padding: .2em .6em;
line-height: 1.5;
text-align: left;
word-break: break-all;
white-space: normal;

& > .oi-flash {
top: 2px;
}
}
}
2 changes: 1 addition & 1 deletion resources/views/components/ejaculation.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</div>
<!-- tags -->
@if ($ejaculation->is_private || $ejaculation->source !== 'web' || $ejaculation->tags->isNotEmpty())
<p class="mb-2">
<p class="tis-checkin-tags mb-2">
@if ($ejaculation->is_private)
<span class="badge badge-warning"><span class="oi oi-lock-locked"></span> 非公開</span>
@endif
Expand Down
2 changes: 1 addition & 1 deletion resources/views/search/relatedTag.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@section('tab-content')
<div class="row">
@forelse($results as $tag)
<p class="col-md-3"><a href="{{ route('search', ['q' => $tag->name]) }}" class="btn btn-outline-primary btn-block" role="button">{{ $tag->name }}</a></p>
<p class="col-md-3 text-break"><a href="{{ route('search', ['q' => $tag->name]) }}" class="btn btn-outline-primary btn-block text-truncate" role="button" title="{{ $tag->name }}">{{ $tag->name }}</a></p>
@empty
<p class="col-12">このキーワードが含まれるタグはありません。</p>
@endforelse
Expand Down
2 changes: 1 addition & 1 deletion resources/views/user/profile.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class="list-group list-group-flush">
@foreach ($tags as $tag)
<a class="list-group-item d-flex justify-content-between align-items-center text-dark" href="{{ route('search', ['q' => $tag->name]) }}">
<div>
<div style="word-break: break-all;">
<span class="oi oi-tag text-secondary"></span>
{{ $tag->name }}
</div>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/user/stats/components/used-tags.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<tbody>
@foreach ($tags as $tag)
<tr>
<td>
<td style="word-break: break-all;">
<a class="text-reset" href="{{ route('search', ['q' => $tag->name]) }}"><span class="oi oi-tag text-secondary mr-2"></span>{{ $tag->name }}</a>
</td>
<td class="text-right">
Expand All @@ -36,7 +36,7 @@
<tbody>
@foreach ($tagsIncludesMetadata as $tag)
<tr>
<td>
<td style="word-break: break-all;">
<a class="text-reset" href="{{ route('search', ['q' => $tag->name]) }}"><span class="oi oi-tag text-secondary mr-2"></span>{{ $tag->name }}</a>
</td>
<td class="text-right">
Expand Down