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

Jump to bottom

Increase navigation logo lockup size (Fixes #15477) #15491

Merged
merged 2 commits into from
Nov 14, 2024
Merged

Increase navigation logo lockup size (Fixes #15477) #15491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52ff612
Increase navigation logo lockup size (Fixes #15477)
alexgibson Nov 13, 2024
7c39697
Review fixes
alexgibson Nov 14, 2024
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
8 changes: 3 additions & 5 deletions bedrock/base/templates/includes/protocol/navigation/navigation-refresh.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@
<div class="m24-c-navigation-l-content">
<div class="m24-c-navigation-container">
<button class="m24-c-navigation-menu-button" type="button" aria-controls="m24-c-navigation-items" data-testid="m24-navigation-menu-button">{{ ftl('ui-menu') }}</button>
<div>
<a href="{{ url('mozorg.home') }}" data-link-text="mozilla home icon" data-link-position="nav">
<img class="m24-c-navigation-logo-image" src="{{ static('img/logos/m24/lockup-black.svg') }}" alt="{{ ftl('navigation-refresh-mozilla') }}" width="88" height="21">
</a>
</div>
<a class="m24-c-navigation-logo-link" href="{{ url('mozorg.home') }}" data-link-text="mozilla home icon" data-link-position="nav">
<img class="m24-c-navigation-logo-image" src="{{ static('img/logos/m24/lockup-black.svg') }}" alt="{{ ftl('navigation-refresh-mozilla') }}" width="101" height="24">
</a>
<div class="m24-c-navigation-items" id="m24-c-navigation-items" data-testid="m24-navigation-menu-items">
<div class="m24-c-navigation-menu">
<div class="m24-c-menu m24-mzp-is-basic">
Expand Down
20 changes: 14 additions & 6 deletions media/css/m24/components/navigation-refresh.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.

$margin-top: 54px; // top margin offset for mobile navigation menu

@keyframes nav-slide-in {
from {
transform: translateX(100%);
Expand Down Expand Up @@ -84,7 +86,7 @@
@include clearfix;

@media #{$mq-md} {
align-items: center;
align-items: start;
display: flex;
flex-direction: row;
justify-content: space-between;
Expand All @@ -105,7 +107,7 @@
font-family: $primary-font;
font-weight: 600;
height: 32px;
margin: 0;
margin: 4px 0 0;
padding: 0;
position: relative;
@include bidi(((float, right, left),));
Expand Down Expand Up @@ -137,12 +139,18 @@
}
}

.m24-c-navigation-logo-link {
display: inline-block;
}

.m24-c-navigation-logo-image {
height: 21px;
height: 27px;
width: auto;
padding-top: $spacing-xs;

@media #{$mq-md} {
padding: 0 0 $spacing-sm;
height: 24px;
padding: 0;
}
}

Expand All @@ -153,8 +161,8 @@
@media (max-width: $screen-md) {
&.mzp-is-open {
display: flex;
height: calc(100vh - 48px); // 48px margin top
margin-top: 48px;
height: calc(100vh - $margin-top);
margin-top: $margin-top;
overflow: hidden auto;
padding-top: 0;
position: fixed;
Expand Down