Change the structure of posts in topics/search

app/templates/layouts/poll.forkbb.php

@@ -1,48 +1,48 @@
-        <div class="f-post-poll">
+            <div class="f-post-poll">
 @if ($poll->canVote)
-          <form class="f-form" method="post" action="{{ $poll->link }}">
-            <input type="hidden" name="token" value="{{ $poll->token }}">
+              <form class="f-form" method="post" action="{{ $poll->link }}">
+                <input type="hidden" name="token" value="{{ $poll->token }}">
 @endif
 @foreach ($poll->question as $q => $question)
-            <fieldset id="id-question-{{ $q }}" class="f-poll-q">
-              <legend class="f-poll-ql">{!! __(['Question %s legend', $q]) !!}</legend>
-              <h3 class="f-poll-qt">{{ $question }}</h3>
+                <fieldset id="id-question-{{ $q }}" class="f-poll-q">
+                  <legend class="f-poll-ql">{!! __(['Question %s legend', $q]) !!}</legend>
+                  <h3 class="f-poll-qt">{{ $question }}</h3>
     @if (($poll->canVote || ! $poll->tid) && $poll->type[$q] > 1)
-              <p class="f-poll-mult">{!! __(['You can choose up to %s answers', $poll->type[$q]]) !!}</p>
+                  <p class="f-poll-mult">{!! __(['You can choose up to %s answers', $poll->type[$q]]) !!}</p>
     @endif
-              <ol class="f-poll-as">
+                  <ol class="f-poll-as">
     @foreach ($poll->answer[$q] as $a => $answer)
-                <li id="id-answer-{{ $q . '-' . $a }}" class="f-poll-a">
+                    <li id="id-answer-{{ $q . '-' . $a }}" class="f-poll-a">
         @if ($poll->canVote || ! $poll->tid)
-                 <label class="f-poll-al">
+                     <label class="f-poll-al">
             @if ($poll->type[$q] > 1)
-                    <input class="f-poll-ai" type="checkbox" name="poll_vote[{{ $q }}][{{ $a }}]" value="1" />
+                        <input class="f-poll-ai" type="checkbox" name="poll_vote[{{ $q }}][{{ $a }}]" value="1" />
             @else
-                    <input class="f-poll-ai" type="radio" name="poll_vote[{{ $q }}][0]" value="{{ $a }}" />
+                        <input class="f-poll-ai" type="radio" name="poll_vote[{{ $q }}][0]" value="{{ $a }}" />
             @endif
-                    <span class="f-poll-at">{{ $answer }}</span>
-                  </label>
+                        <span class="f-poll-at">{{ $answer }}</span>
+                      </label>
         @elseif ($poll->canSeeResult)
-                  <span class="f-poll-at">{{ $answer }}</span>
-                  <span class="f-poll-ap">{!! __(['(%1$s [%2$s%%])', $poll->vote[$q][$a], $poll->percVote[$q][$a]]) !!}</span>
-                  <p class="f-poll-ab"><span class="f-poll-ab-s1 width{{ $poll->widthVote[$q][$a] }}"><span class="f-poll-ab-s2">{{ $poll->widthVote[$q][$a] }}%</span></span></p>
+                      <span class="f-poll-at">{{ $answer }}</span>
+                      <span class="f-poll-ap">{!! __(['(%1$s [%2$s%%])', $poll->vote[$q][$a], $poll->percVote[$q][$a]]) !!}</span>
+                      <p class="f-poll-ab"><span class="f-poll-ab-s1 width{{ $poll->widthVote[$q][$a] }}"><span class="f-poll-ab-s2">{{ $poll->widthVote[$q][$a] }}%</span></span></p>
         @else
-                  <label class="f-poll-al">
-                    <span class="f-poll-at">{{ $answer }}</span>
-                  </label>
+                      <label class="f-poll-al">
+                        <span class="f-poll-at">{{ $answer }}</span>
+                      </label>
         @endif
-                </li>
+                    </li>
     @endforeach
-              </ol>
-              <p class="f-poll-total">{!! __(['In total voted: %s', $poll->total[$q] ?? 0]) !!}</p>
-            </fieldset>
+                  </ol>
+                  <p class="f-poll-total">{!! __(['In total voted: %s', $poll->total[$q] ?? 0]) !!}</p>
+                </fieldset>
 @endforeach
 @if ($poll->canVote)
-            <p class="f-poll-btns">
-              <button class="f-btn" name="vote" value="{{ __('Vote') }}" title="{{ __('Vote') }}"><span>{!! __('Vote') !!}</span></button>
-            </p>
-          </form>
+                <p class="f-poll-btns">
+                  <button class="f-btn" name="vote" value="{{ __('Vote') }}" title="{{ __('Vote') }}"><span>{!! __('Vote') !!}</span></button>
+                </p>
+              </form>
 @elseif (null !== $poll->status)
-          <p class="f-poll-status"><span>{!! __($poll->status) !!}</span></p>
+              <p class="f-poll-status"><span>{!! __($poll->status) !!}</span></p>
 @endif
-        </div>
+            </div>

app/templates/post.forkbb.php

@@ -9,10 +9,10 @@
       <div class="f-post-body">
         <div class="f-post-main">
           {!! $p->previewHtml !!}
-        </div>
     @if ($poll = $p->poll)
         @include ('layouts/poll')
     @endif
+        </div>
       </div>
     </section>
 @endif

app/templates/topic.forkbb.php

@@ -108,22 +108,18 @@
         <div class="f-post-body">
           <div class="f-post-main">
             {!! $post->html() !!}
-          </div>
         @if (1 === $post->postNumber && ($poll = $p->poll))
             @include ('layouts/poll')
         @endif
+          </div>
         @if ($p->user->showSignature && $post->user->isSignature)
           <aside class="f-post-signature">
             <hr>
             {!! $post->user->htmlSign !!}
           </aside>
         @endif
-        </div>
-        <footer class="f-post-footer">
-          <div class="f-post-footer-add">
-          </div>
         @if ($post->canReport || $post->canDelete || $post->canEdit || $post->canQuote)
-          <div class="f-post-btns">
+          <aside class="f-post-btns">
             <ul>
             @if ($post->canReport)
               <li class="f-postreport"><a class="f-btn f-minor" title="{{ __('Report') }}" href="{{ $post->linkReport }}"><span>{!! __('Report') !!}</span></a></li>
@@ -138,9 +134,9 @@
               <li class="f-postquote"><a class="f-btn" title="{{ __('Quote') }}" href="{{ $post->linkQuote }}"><span>{!! __('Quote') !!}</span></a></li>
             @endif
             </ul>
-          </div>
+          </aside>
         @endif
-        </footer>
+        </div>
       </article>
     @endif
 @endforeach

app/templates/topic_in_search.forkbb.php

@@ -75,18 +75,13 @@
           <div class="f-post-main">
             {!! $post->html() !!}
           </div>
-        </div>
-        <footer class="f-post-footer">
-          <div class="f-post-footer-add">
-            <span></span>
-          </div>
-          <div class="f-post-btns">
+          <aside class="f-post-btns">
             <ul>
               <li class="f-posttotopic"><a class="f-btn" href="{{ $post->parent->link }}">{!! __('Go to topic') !!}</a></li>
               <li class="f-posttopost"><a class="f-btn" href="{{ $post->link }}">{!! __('Go to post') !!}</a></li>
             </ul>
-          </div>
-        </footer>
+          </aside>
+        </div>
       </article>
     @endif
 @endforeach

public/style/ForkBB/style.css

@@ -1495,11 +1495,6 @@ body,
   display: none;
 }
 
-#fork .f-post-body img {
-  max-width: 100%;
-  height: auto;
-}
-
 #fork .f-username {
   font-size: 1.25rem;
   word-break: break-all;
@@ -1531,12 +1526,21 @@ body,
   display: none !important;
 }
 
+#fork .f-post-body {
+  padding: 0.3125rem;
+}
+
+#fork .f-post-body img {
+  max-width: 100%;
+  height: auto;
+}
+
 #fork .f-post-main {
-  padding: 0.625rem 0.625rem 0;
+  padding: 0.3125rem;
 }
 
 #fork .f-post-btns {
-  padding: 0 0.625rem 0.625rem;
+  padding: 0.3125rem;
 }
 
 #fork .f-post-btns:not(:hover) .f-btn:not(:focus) {
@@ -1550,14 +1554,14 @@ body,
   gap: 0.3125rem;
 }
 
-#fork .f-post-footer-add {
+/* #fork .f-post-footer-add {
   display: none;
-}
+} */
 
 #fork .f-post-signature {
   font-size: 0.875rem;
   opacity: 0.5;
-  padding: 0 0.625rem;
+  padding: 0.3125rem;
 }
 
 #fork .f-admin-note {
@@ -1578,6 +1582,7 @@ body,
   opacity: 0.5;
   font-style: italic;
   font-size: 0.875rem;
+  padding-top: 0.625rem;
 }
 
 #fork .f-bb-quote {
@@ -1641,7 +1646,7 @@ body,
 #fork .f-post-body pre,
 #fork .f-post-body ol,
 #fork .f-post-body ul {
-  margin-bottom: 0.625rem;
+  /* margin-bottom: 0.625rem; */
 }
 
 @media screen and (min-width: 50rem) {
@@ -1698,13 +1703,18 @@ body,
   }
 
 
-  #fork .f-post-body,
-  #fork .f-post-btns {
+  #fork .f-post-body { /* #fork .f-post-btns */
     width: calc(100% - 13rem);
     position: relative;
+    display: flex;
+    flex-direction: column;
   }
 
-  #fork .f-post-footer {
+  #fork .f-post-main {
+    flex-grow: 1;
+  }
+
+/*  #fork .f-post-footer {
     display: flex;
     flex-wrap: nowrap;
     width: 100%;
@@ -1716,7 +1726,7 @@ body,
     padding: 0 0.625rem 0.625rem;
     background-color: #F8F4E3;
     border-inline-end: 0.0625rem solid #AA7939;
-  }
+  } */
 
   #fork .f-avatar > img {
     max-width: 100%;
@@ -1806,7 +1816,7 @@ body,
 /* Опрос */
 /*********/
 #fork .f-post-poll {
-  margin: 0.625rem;
+  margin-top: 0.625rem;
   padding: 0.625rem 0.625rem 0;
   background-color: #F8F4E3;
   border: 0.0625rem solid #AA7939;
@@ -1873,7 +1883,7 @@ body,
   font-style: italic;
   text-align: center;
   border-top: 0.0625rem solid #AA7939;
-  padding-top: 0.625rem;
+  padding: 0.625rem;
 }
 
 #fork .f-poll-btns {