From fdeba23914ab35edba50c2ff7781d2fb48c2e36b Mon Sep 17 00:00:00 2001 From: "stephen@cubedesigners.com" Date: Mon, 5 Mar 2018 15:18:08 +0000 Subject: [PATCH] Tidy up of header resizing. WIP #1912 @1.5 --- .../assets/styles/layouts/header.styl | 19 ++++++++++++------- .../resources/views/layouts/app.blade.php | 3 ++- ... => template-transparent-header.blade.php} | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) rename wp-content/themes/physioassist/resources/views/{template-custom.blade.php => template-transparent-header.blade.php} (84%) diff --git a/wp-content/themes/physioassist/resources/assets/styles/layouts/header.styl b/wp-content/themes/physioassist/resources/assets/styles/layouts/header.styl index b209bb29..b19883b9 100644 --- a/wp-content/themes/physioassist/resources/assets/styles/layouts/header.styl +++ b/wp-content/themes/physioassist/resources/assets/styles/layouts/header.styl @@ -1,11 +1,17 @@ +body.header-compact:not(.template-transparent-header) + padding-top: 65px + header.site center() position: relative z-index: 10 - // Mini header style - &.header-mini + // Mini header style - used for default template and also triggered + // on hero-content pages when .header-compact class is added upon scroll + .header-compact & position: fixed + top: 0 + left: 0 max-width: none width: 100% background-color: #003e65 @@ -48,7 +54,7 @@ header.site // Mini version of header - when this class is applied to a parent, // symbol should hide and logo text should scale down smoothly - .header-mini & + .header-compact header.site & max-width: 235px margin: 0 10px 15px 4px .logo-symbol @@ -71,10 +77,9 @@ header.site &-text width: 77.97% // Proportional width of text from original full logo - // Override text colour when on home page - .home & - path, rect - fill: #fff + // Override text colour (previously only for home, now it's white in all uses) + path, rect + fill: #fff .navigation diff --git a/wp-content/themes/physioassist/resources/views/layouts/app.blade.php b/wp-content/themes/physioassist/resources/views/layouts/app.blade.php index 12ab2533..6942b19a 100644 --- a/wp-content/themes/physioassist/resources/views/layouts/app.blade.php +++ b/wp-content/themes/physioassist/resources/views/layouts/app.blade.php @@ -1,7 +1,8 @@ @include('partials.head') - + {{-- When not using the hero image header template the compact header is set --}} + @php(do_action('get_header')) @include('partials.header')

diff --git a/wp-content/themes/physioassist/resources/views/template-custom.blade.php b/wp-content/themes/physioassist/resources/views/template-transparent-header.blade.php similarity index 84% rename from wp-content/themes/physioassist/resources/views/template-custom.blade.php rename to wp-content/themes/physioassist/resources/views/template-transparent-header.blade.php index 762a54a3..19273509 100644 --- a/wp-content/themes/physioassist/resources/views/template-custom.blade.php +++ b/wp-content/themes/physioassist/resources/views/template-transparent-header.blade.php @@ -1,5 +1,5 @@ {{-- - Template Name: Custom Template + Template Name: Transparent Header --}} @extends('layouts.app') -- 2.39.5