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.

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 13 commits into
base: main-menu-CMS-169
Choose a base branch
from

Conversation

helenb
Copy link
Contributor

@helenb helenb commented Jan 6, 2025

What is the context of this PR?

  • Fixes an issue with the CSS in the main menu which meant that the column widths weren't consistent when different numbers of columns were output.
  • Targets Main Menu #41 as this PR is based off it.

How to review

Follow-up Actions

List any follow-up actions (if applicable), like needed documentation updates or additional testing.

zerolab and others added 6 commits December 10, 2024 15:12
* Fix cookiebanner settings link URL variable name (CMS-265)
* Make the contact details name + email unique (CMS-225)
  * Add test for the unique constraint
  * Update contact details listings to include email/phone
* Bump deps. Mainly Django 5.1.4
---------

Co-authored-by: Mebin Abraham <[email protected]>
Co-authored-by: kacperpONS <[email protected]>
Co-authored-by: Dan Braghiș <[email protected]>
Co-authored-by: Jake Howard <[email protected]>
Co-authored-by: Helen Chapman <[email protected]>
Co-authored-by: Mebin Abraham <[email protected]>
* Add a custom chooser for release calendar pages that only includes upcoming release calendar pages
* Add missing string translation on the information page template
* Drop page status column
* Ensure the bundle page chooser deduplicates choices
…pdate the macro to ensure both text and link are present before outputting a link
@helenb helenb requested a review from a team as a code owner January 6, 2025 11:49
@helenb helenb marked this pull request as draft January 6, 2025 11:49
</a>
{% endif %}
<a href="{{ item.url }}" class="navigation__link">
<h2 class="ons-u-fs-s--b ons-u-mb-no navigation__heading avigation__heading--key-link">{{ item.text }}</h2>
Copy link
Contributor

@zerolab zerolab Jan 7, 2025

Choose a reason for hiding this comment

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

question: should the nesting be inverted? that is: <h2><a></a></h2> rather than <a><h2>></h2></a> or is this how the DS does it?

Copy link
Contributor Author

@helenb helenb Jan 9, 2025

Choose a reason for hiding this comment

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

Good spot. In terms of HTML(5) validation, it doesn't matter. I can't see an example of a header and link together in the current base template in the design system, but both gov.uk and w3c use links inside headings, so I'll switch it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done.

helenb and others added 6 commits January 8, 2025 08:18
* Exclude any release calendar page with a past date from the bundle RC chooser

* Update dependencies

Mainly Wagtail 6.2.3
Also includes https://pillow.readthedocs.io/en/stable/releasenotes/11.1.0.html which should speed up PNG saving
* Styling for the release page plus some refactoring

* Spacing tweaks

* Duplicate accreditation logo to avoid sharing classes with the header

* Pass through classes to census and accreditation logos to be DRY

* Fix to spacing class

* Adjust layout of census and accreditation logos, and ensure census logo is visible in high-contrast mode

* Add a new include for contact details, and ensure spacing of release content is correct

* Make the contact details component variable more generic

---------

Co-authored-by: Dan Braghiș <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants