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

Re-introduce 25/75 split in the top navigation #2067

Merged
merged 2 commits into from
Jan 31, 2025
Merged

Re-introduce 25/75 split in the top navigation #2067

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
75e7c00
Re-introduce 25/75 split in the top navigation
bartaz Jan 29, 2025
d18be82
Readjust the breakpoint to fit a signed in user name
bartaz Jan 29, 2025
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"style-loader": "4.0.0",
"ts-loader": "9.5.1",
"typescript": "5.7.2",
"vanilla-framework": "4.19.0",
"vanilla-framework": "4.20.3",
"watch-cli": "0.2.3",
"webpack": "5.97.1",
"webpack-cli": "6.0.1"
Expand Down
2 changes: 1 addition & 1 deletion static/js/src/base/global-nav.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createNav } from "@canonical/global-nav";

createNav({
breakpoint: 1110,
breakpoint: 1220, // keep it in sync with $breakpoint-navigation-threshold in styles.scss
});
2 changes: 1 addition & 1 deletion static/sass/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

$brand-color: #772953;
$color-text-orange: #d54110;
$breakpoint-large: 1220px;
$breakpoint-navigation-threshold: 1220px; // keep it in sync with juju.is and breakpoint value in global-nav.ts

// import cookie policy
@import "@canonical/cookie-policy/build/css/cookie-policy";
Expand Down
2 changes: 1 addition & 1 deletion templates/partial/_navigation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<header id="navigation" class="p-navigation is-dark">
<div class="p-navigation__row">
<div class="p-navigation__row--25-75">
<div class="p-navigation__banner">
<div class="p-navigation__tagged-logo">
<a class="p-navigation__link" href="https://juju.is">
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8464,10 +8464,10 @@ v8-to-istanbul@^9.0.1:
"@types/istanbul-lib-coverage" "^2.0.1"
convert-source-map "^2.0.0"

vanilla-framework@4.19.0:
version "4.19.0"
resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-4.19.0.tgz#36fa67a5434ae3222bb83ca04159e87d45ae49a1"
integrity sha512-LnB6GdSJHBOVZNlkmEid15tbsweBe1E0T5Mh54KhhUf3JsdLPJSqrUROD/YehZLCHyeEZNDpLnEtaU8YSRz54A==
vanilla-framework@4.20.3:
version "4.20.3"
resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-4.20.3.tgz#a306e80f32f5c6b6f107c02e64cc642c6eb32148"
integrity sha512-8nE8BxHRckdjo8VYW0jVLK9JMz1XAoTZcKGweg0jM8cV+/D313pPyomEeODAD1qq66yf/W0RfHTXv/wp0AaYfQ==

[email protected]:
version "4.9.0"
Expand Down
Loading