fix: primary bg with showing header UI results in invisible links

SychO9 · Jun 7, 2022 · 81534b3 · 81534b3
1 parent 82aea3d
commit 81534b3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/js/src/forum/components/PrivateFacade.tsx b/js/src/forum/components/PrivateFacade.tsx
@@ -46,9 +46,12 @@ export default class PrivateFacade<T extends IPageAttrs> extends Page<T> {
       document.body.classList.add('body--privateFacade');
     }
 
+    const showHeader = !['show_only_logo', 'hide_secondary_items'].includes(app.forum.attribute('sycho-private-facade.header_layout'));
+
     this.bodyClass = classList({
       'App--privateFacade': true,
-      'App--privateFacade--logoOnly': ['show_only_logo', 'hide_secondary_items'].includes(app.forum.attribute('sycho-private-facade.header_layout')),
+      'App--privateFacade--showHeader': showHeader,
+      'App--privateFacade--logoOnly': !showHeader,
       'App--privateFacade--primaryBg': app.forum.attribute('sycho-private-facade.primary_color_bg'),
     });
   }

diff --git a/js/src/forum/index.tsx b/js/src/forum/index.tsx
@@ -37,7 +37,7 @@ app.initializers.add('sycho/flarum-private-facade', () => {
 
     const original = orig(...args);
 
-    if (isPrivateFacadePage() && original && app.forum.attribute('sycho-private-facade.primary_color_bg')) {
+    if (isPrivateFacadePage() && original && app.forum.attribute('sycho-private-facade.primary_color_bg') && app.forum.attribute('sycho-private-facade.header_layout') !== 'show_header') {
       (original as Mithril.Vnode<any>).attrs['data-primary-background'] = true;
     }
 

diff --git a/less/forum.less b/less/forum.less
@@ -46,6 +46,14 @@
     }
   }
 
+  &--showHeader {
+    @media @tablet-up {
+      .Header-title {
+        float: left;
+      }
+    }
+  }
+
   @media @phone {
     .App-content {
       background-color: transparent;