Skip to content

Commit

Permalink
Bump to vanilla-4.7.0 (canonical#13548)
Browse files Browse the repository at this point in the history
* Bump to vanilla-4.7.0

* Revert navigation padding

* Update global-nav padding to align with content

* Add p-navigation__row--25-75

* Make css adjustments to fit new vainlla pattern

* Apply changes from cpde review

* Re-align secondary nav

* Make top nav align right

* Decrease breakpoint-threshold

* Format SCSS
  • Loading branch information
petesfrench authored Feb 21, 2024
1 parent 4a22762 commit 478db36
Show file tree
Hide file tree
Showing 9 changed files with 213 additions and 178 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"typescript": "4.5.4",
"url-polyfill": "1.1.12",
"url-search-params-polyfill": "8.1.1",
"vanilla-framework": "4.5.1",
"vanilla-framework": "4.7.0",
"yup": "0.32.11"
},
"resolutions": {
Expand Down
2 changes: 1 addition & 1 deletion static/js/src/navigation.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const ANIMATION_DELAY = 200;
const MOBILE_VIEW_BREAKPOINT = 1281;
const MOBILE_VIEW_BREAKPOINT = 1228;
const dropdownWindow = document.querySelector(".dropdown-window");
const dropdownWindowOverlay = document.querySelector(
".dropdown-window-overlay"
Expand Down
2 changes: 1 addition & 1 deletion static/sass/_global-settings.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$breakpoint-medium: 875px;
$viewport-threshold: 1281px;
$viewport-threshold: 1212px;
$color-brand: #e95420;
$color-dark: #111;
$color-positive: #0e8420 !default;
Expand Down
13 changes: 11 additions & 2 deletions static/sass/_pattern_navigation-dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
@media (max-width: $breakpoint-navigation-threshold - 1) {
display: none !important;
}

.global-nav-dropdown .global-nav__row {
padding: 0 2rem;

.col-9 {
margin-left: 0.25rem;
}
}
}

.dropdown-window-overlay {
Expand Down Expand Up @@ -114,11 +122,12 @@

.dropdown-window__main-panel,
.dropdown-window__side-panel {
margin: 2.5rem 0 2.5rem -0.5rem;
margin: 2rem 0 2.5rem -0.5rem;

.p-muted-heading {
color: rgba(255, 255, 255, 0.6);
padding-left: 0.5rem;
padding-top: 0.25rem;
}

.p-navigation__dropdown-item {
Expand Down Expand Up @@ -168,7 +177,7 @@
}

.dropdown-window__side-panel {
margin: 2.5rem 0;
margin: 2rem 0;
padding: 0;

.p-list {
Expand Down
Loading

0 comments on commit 478db36

Please sign in to comment.