Merge pull request #1207 from shikorism/fix/modest-information

サイトトップのお知らせ表示を小さめにした
shikorism · Jun 25, 2024 · a3788f9 · a3788f9
2 parents 905f0c4 + 5e275b1
commit a3788f9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/resources/assets/sass/tissue.css b/resources/assets/sass/tissue.css
@@ -54,12 +54,6 @@
     border-radius: 0;
 }
 
-@media (min-width: 992px) {
-    .tis-sidebar-info {
-        font-size: small;
-    }
-}
-
 #navbarNav > .d-lg-none > .row > div:first-of-type {
     padding-right: 7.5px;
     padding-left: 15px;

diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
@@ -4,6 +4,22 @@
 @endpush
 
 @section('content')
+@if (!empty($informations))
+<div class="mt-n4 mb-4 pt-2 bg-light border-top border-bottom">
+    <div class="container d-flex" style="gap: .5rem;">
+        <div class="flex-shrink-0 font-weight-bold"><i class="ti ti-info-circle"></i></div>
+        <ul class="flex-grow list-unstyled mb-0 small">
+            @foreach($informations as $info)
+                <li class="mb-2">
+                    <a href="{{ route('info.show', ['id' => $info->id]) }}">
+                        <span class="badge {{ $categories[$info->category]['class'] }}">{{ $categories[$info->category]['label'] }}</span> {{ $info->title }} <small class="text-secondary">- {{ $info->created_at->format('n月j日') }}</small>
+                    </a>
+                </li>
+            @endforeach
+        </ul>
+    </div>
+</div>
+@endif
 <div class="container">
     <div class="row">
         <div class="col-lg-4">
@@ -15,20 +31,6 @@
                     @endcomponent
                 </div>
             </div>
-            <div class="card mb-4">
-                <div class="card-header">サイトからのお知らせ</div>
-                <div class="list-group list-group-flush tis-sidebar-info">
-                    @foreach($informations as $info)
-                        <a class="list-group-item" href="{{ route('info.show', ['id' => $info->id]) }}">
-                            @if ($info->pinned)
-                                <span class="badge badge-secondary"><i class="ti ti-pinned-filled"></i>ピン留め</span>
-                            @endif
-                            <span class="badge {{ $categories[$info->category]['class'] }}">{{ $categories[$info->category]['label'] }}</span> {{ $info->title }} <small class="text-secondary">- {{ $info->created_at->format('n月j日') }}</small>
-                        </a>
-                    @endforeach
-                    <a href="{{ route('info') }}" class="list-group-item text-right">お知らせ一覧 &raquo;</a>
-                </div>
-            </div>
         </div>
         <div class="col-lg-8">
             @if (!empty($globalEjaculationCounts))