Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix header logo block size #356

Closed
wants to merge 1 commit into from
Closed

Fix header logo block size #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/scss/custom/layout/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ $component-name: header;
margin-right: 0.25rem;
}
}

.navbar-brand {
.logo {
width: auto;
max-height: 2rem;
}
}
}

& &__bottom {
Expand All @@ -33,7 +40,10 @@ $component-name: header;
}

.navbar-brand {
padding: 0;
.logo {
width: auto;
max-height: 4rem;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've some doubts, should we constraint the height of the logo itself or the navbar? So it adapts to every situations

Would love your opinion @SharakPL @Hlavtox , seems like my integrations skills are getting rusty these days

Copy link
Contributor

@JBLach JBLach Aug 4, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think a better solution would be to leave img-fluid for the logo and add max-height: 4rem to the navbar-brand class as you say @NeOMakinG
WDYT? @mparvazi

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed height navbar-brand & img-fluid logo

Screenshot from 2022-08-04 15-43-17

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dont forget we need to think about CLS, space for the logo must be preserved before it loads, otherwise the page will jump.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something like this with lazy-load script?

<img class="logo" 
  src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" 
  data-lazy="{$shop.logo_details.src}" 
  alt="{$shop.name}" 
  width="{$shop.logo_details.width}" 
  height="{$shop.logo_details.height}"
>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's bad practice to give a lazyload above the fold, there may be problems with CLS

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that was stupid, forget about that.

Copy link
Member Author

@mparvazi mparvazi Aug 4, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

{$max_logo_height = 75}
{$ratio = 1}
{if $shop.logo_details.height > $max_logo_height}
    {$ratio = $max_logo_height / $shop.logo_details.height}
{/if}

<img 
  class="logo img-fluid" 
  src="{$shop.logo_details.src}" 
  width="{$shop.logo_details.width * $ratio}" 
  height="{$shop.logo_details.height * $ratio}"
/>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's look fine for me, and the navbar-brand with inline-flex class just like in your PR

}
}

.nav-link {
Expand Down
6 changes: 3 additions & 3 deletions templates/_partials/header.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<div class="search__mobile hide-on-desktop">
<button class="search__mobile__toggler btn d-xl-none" type="button" data-bs-toggle="offcanvas" data-bs-target="#searchCanvas" aria-controls="searchCanvas">
<span class="material-icons">search</span>
<span class="material-icons">search</span>
</button>

<div class="search__offcanvas js-search-offcanvas offcanvas offcanvas-top" data-bs-backdrop="false" data-bs-scroll="true" tabindex="-1" id="searchCanvas" aria-labelledby="offcanvasTopLabel">
Expand All @@ -51,9 +51,9 @@
<div class="{$headerBottomName}">
<div class="container {$headerBottomName}__container">
<div id="_desktop_logo" class="logo logo-desktop order-1 order-xl-0">
{if $page.page_name == 'index'}<h1>{/if}
{if $page.page_name == 'index'}<h1 class="m-0 d-inline-flex">{/if}
<a class="navbar-brand" href="{$urls.pages.index}">
<img class="logo img-fluid" src="{$shop.logo_details.src}" alt="{$shop.name}" loading="lazy" width="{$shop.logo_details.width}" height="{$shop.logo_details.height}">
<img class="logo" src="{$shop.logo_details.src}" alt="{$shop.name}" loading="lazy" width="{$shop.logo_details.width}" height="{$shop.logo_details.height}">
</a>
{if $page.page_name == 'index'}</h1>{/if}
</div>
Expand Down