Przeglądaj źródła

Make the <h1> heading dependent on the page content

Continuation
Visman 2 lat temu
rodzic
commit
5d6d08e98a

+ 4 - 1
app/Models/Pages/Admin.php

@@ -105,7 +105,10 @@ abstract class Admin extends Page
         }
         }
 
 
         $crumbs[] = [$this->c->Router->link('Admin'), 'Admin title'];
         $crumbs[] = [$this->c->Router->link('Admin'), 'Admin title'];
+        $result   = parent::crumbs(...$crumbs);
 
 
-        return parent::crumbs(...$crumbs);
+        $this->adminHeader = \end($result)[1];
+
+        return $result;
     }
     }
 }
 }

+ 4 - 1
app/Models/Pages/PM/AbstractPM.php

@@ -205,7 +205,10 @@ abstract class AbstractPM extends Page
         }
         }
 
 
         $crumbs[] = [$this->c->Router->link('PM'), 'PM'];
         $crumbs[] = [$this->c->Router->link('PM'), 'PM'];
+        $result   = parent::crumbs(...$crumbs);
 
 
-        return parent::crumbs(...$crumbs);
+        $this->pmHeader = \end($result)[1];
+
+        return $result;
     }
     }
 }
 }

+ 5 - 3
app/templates/ban.forkbb.php

@@ -1,6 +1,8 @@
 @extends ('layouts/main')
 @extends ('layouts/main')
-    <section id="fork-ban" class="f-main">
-      <h2>{!! __('Info') !!}</h2>
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __('Info') !!}</h1>
+    </div>
+    <div id="fork-ban" class="f-main">
 @if ($p->bannedIp)
 @if ($p->bannedIp)
       <p>{!! __('Your IP is blocked') !!}</p>
       <p>{!! __('Your IP is blocked') !!}</p>
 @else
 @else
@@ -14,4 +16,4 @@
       <p><b>{{ $p->ban['message'] }}</b></p>
       <p><b>{{ $p->ban['message'] }}</b></p>
 @endif
 @endif
       <p>{!! __(['Ban message contact %s', $p->adminEmail]) !!}</p>
       <p>{!! __(['Ban message contact %s', $p->adminEmail]) !!}</p>
-    </section>
+    </div>

+ 3 - 0
app/templates/layouts/admin.forkbb.php

@@ -1,5 +1,8 @@
 @include ('layouts/crumbs')
 @include ('layouts/crumbs')
 @extends ('layouts/main')
 @extends ('layouts/main')
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __($p->adminHeader) !!}</h1>
+    </div>
     <div class="f-nav-links f-nav-admin{{ $p->mainSuffix or '' }}-links">
     <div class="f-nav-links f-nav-admin{{ $p->mainSuffix or '' }}-links">
 @yield ('crumbs')
 @yield ('crumbs')
     </div>
     </div>

+ 3 - 0
app/templates/layouts/pm.forkbb.php

@@ -1,5 +1,8 @@
 @include ('layouts/crumbs')
 @include ('layouts/crumbs')
 @extends ('layouts/main')
 @extends ('layouts/main')
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __($p->pmHeader) !!}</h1>
+    </div>
     <div class="f-nav-links f-nav-pm-links">
     <div class="f-nav-links f-nav-pm-links">
 @yield ('crumbs')
 @yield ('crumbs')
     </div>
     </div>

+ 5 - 3
app/templates/moderate.forkbb.php

@@ -1,13 +1,15 @@
 @include ('layouts/crumbs')
 @include ('layouts/crumbs')
 @extends ('layouts/main')
 @extends ('layouts/main')
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __($p->formTitle) !!}</h1>
+    </div>
     <div class="f-nav-links">
     <div class="f-nav-links">
 @yield ('crumbs')
 @yield ('crumbs')
     </div>
     </div>
 @if ($form = $p->form)
 @if ($form = $p->form)
-    <section id="fork-modform" class="f-main">
-      <h2>{!! __($p->formTitle) !!}</h2>
+    <div id="fork-modform" class="f-main">
       <div class="f-fdiv">
       <div class="f-fdiv">
     @include ('layouts/form')
     @include ('layouts/form')
       </div>
       </div>
-    </section>
+    </div>
 @endif
 @endif

+ 3 - 7
public/style/ForkBB/style.css

@@ -234,7 +234,8 @@ body,
 }
 }
 
 
 #fork #fork-h1 {
 #fork #fork-h1 {
-  font-size: 1.5rem;
+  font-size: 1.75rem;
+  font-size: clamp(1.25rem, 5vw, 1.75rem);
   font-style: italic;
   font-style: italic;
   line-height: 1.1;
   line-height: 1.1;
   overflow: hidden;
   overflow: hidden;
@@ -249,12 +250,6 @@ body,
   background-color: #E0C8B3; /*#DABCA0; #D3B58D;*/
   background-color: #E0C8B3; /*#DABCA0; #D3B58D;*/
 }
 }
 
 
-@media screen and (min-width: 34.0625rem) {
-  #fork #fork-h1 {
-    font-size: 1.75rem;
-  }
-}
-
 #fork section > h2,
 #fork section > h2,
 #fork aside > h2 {
 #fork aside > h2 {
   display: none;
   display: none;
@@ -605,6 +600,7 @@ body,
   width: calc(100% - 4rem);
   width: calc(100% - 4rem);
   padding: 0.625rem;
   padding: 0.625rem;
   font-size: 2rem;
   font-size: 2rem;
+  font-size: clamp(1.5rem, 5vw, 2rem);
   overflow: hidden;
   overflow: hidden;
   white-space: nowrap;
   white-space: nowrap;
   text-overflow: ellipsis;
   text-overflow: ellipsis;