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

Update the menu CSS to ensure the columns are consistent width, and update the macro to ensure both text and link are present before outputting a link #63

Draft
wants to merge 23 commits into
base: main-menu-CMS-169
Choose a base branch
from
+4,477 −2,031
Draft

Update the menu CSS to ensure the columns are consistent width, and update the macro to ensure both text and link are present before outputting a link #63

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
46f22a0
UAT fixes (#56)
zerolab Dec 10, 2024
f4757a5
Add CI job to add coverage to GH Action summary (#58)
zerolab Dec 13, 2024
3e87d03
Introduce Megalinter (#40)
AWitcherONS Dec 13, 2024
30366c9
Wire in the quote block (#59)
zerolab Dec 13, 2024
e45793d
Bundles: limit release calendar pages to provisional/confirmed (#50)
zerolab Dec 13, 2024
8a8d819
Update the menu CSS to ensure the columns are consistent width, and u…
helenb Jan 6, 2025
fb685b0
Remove unnecessary ifs and elses
helenb Jan 7, 2025
bca747c
Ignore vscode workspace settings files (#65)
helenb Jan 8, 2025
d462538
Disable markup from megalinter (#64)
AWitcherONS Jan 8, 2025
053da50
Bundles: exclude Release Calendar pages with a date in the past (#66)
zerolab Jan 8, 2025
480025c
Styling for the release page plus some refactoring (#55)
helenb Jan 8, 2025
c13d2d5
Merge remote-tracking branch 'origin/main' into fix/main-menu-alignme…
helenb Jan 9, 2025
46d7892
Invert the heading and link tags
helenb Jan 9, 2025
1c92736
Ensure the default DB is **always** used for writes (#68)
RealOrangeOne Jan 9, 2025
c9c094a
Methodology page (#57)
kacperpONS Jan 9, 2025
49a3573
Add an articles app for statistical articles (#69)
zerolab Jan 10, 2025
a26f47b
Remove the analysis models (#70)
zerolab Jan 10, 2025
0bb3958
Update readme with extra steps needed for pre-commit (#67)
helenb Jan 10, 2025
a14d9b4
Fix for equations and embeds rendering on Methodology page(#74)
kacperpONS Jan 10, 2025
5a6f11e
Fix to related content on the release page (#72)
helenb Jan 10, 2025
ee17ec7
Remove the analysis app (#71)
zerolab Jan 10, 2025
70c93d7
Introduce Functional Tests using Playwright and Behave #31
AdamHawtin Jan 13, 2025
44b3c3b
Merge remote-tracking branch 'origin/main' into fix/main-menu-alignme…
helenb Jan 13, 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
9 changes: 3 additions & 6 deletions cms/jinja2/component_overrides/header/_macro.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,7 @@
<div class="ons-container">
<ul class="ons-grid ons-grid-flex-gap ons-grid-flex-gap--40 navigation__key-links ons-list ons-list--bare">
{% for item in params.navLinks.keyLinksList %}
{# In the new header, nav items can have text and no link - later we would want to test that both are present before outputting an li #}
{% if item.text %}
{% if item.text and item.url %}
<li class="ons-grid__col ons-col-4@m ons-u-mb-no">
{% if item.url %}
<a href="{{ item.url }}" class="navigation__link">
Expand All @@ -176,8 +175,7 @@
{% for item in params.navLinks.itemsList %}
<li class="ons-grid__col ons-col-4@m ons-u-mb-no">
{% for link in item.linksList %}
{# In the new header, nav items can have text and no link - later we would want to test that both are present before outputting a heading link #}
{% if link.text %}
{% if link.text and link.url %}
{% if link.url %}
zerolab marked this conversation as resolved.
Show resolved Hide resolved
<a
href="{{ link.url }}"
Expand All @@ -194,8 +192,7 @@
{% if link.children %}
<ul class="ons-list ons-list--bare navigation__child-list">
{% for child in link.children %}
{# In the new header, nav items can have text and no link - later we would want to test that both are present before outputting an li #}
{% if child.text %}
{% if child.text and child.url %}
<li class="ons-u-mb-no">
{% if child.url %}
<a
Expand Down
11 changes: 11 additions & 0 deletions cms/static_src/sass/components/design_system_overrides/_grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,14 @@
}
/* stylelint-enable selector-class-pattern */
}

/* stylelint-disable selector-class-pattern */
// Note that in the design system, this needs to be defined for all column and gap variations
.ons-col-4\@m {
@include media-query('m') {
max-width: calc(33.333333333% - rem-sizing(40));
width: calc(33.333333333% - rem-sizing(40));
flex-basis: calc(33.333333333% - rem-sizing(40));
}
}
/* stylelint-enable selector-class-pattern */