diff --git a/CHANGELOG.md b/CHANGELOG.md index c8decd79..93fda098 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/nationalarchives/tna-frontend/compare/v0.2.10...HEAD) +## [Unreleased](https://github.com/nationalarchives/tna-frontend/compare/v0.2.11...HEAD) ### Added ### Changed @@ -14,6 +14,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security +## [0.2.11](https://github.com/nationalarchives/tna-frontend/compare/v0.2.10...v0.2.11) - 2024-08-30 + +### Removed + +- Removed `$import-google-fonts` option +- Removed the `@import` rule for Google Fonts + +### Fixed + +- Increased `z-index` of active summary buttons on accordions + ## [0.2.10](https://github.com/nationalarchives/tna-frontend/compare/v0.2.9...v0.2.10) - 2024-08-30 ### Added diff --git a/package-lock.json b/package-lock.json index 37f780d2..f3aea0a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@nationalarchives/frontend", - "version": "0.2.10", + "version": "0.2.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@nationalarchives/frontend", - "version": "0.2.10", + "version": "0.2.11", "license": "MIT", "devDependencies": { "@babel/core": "^7.25.2", diff --git a/package.json b/package.json index d98bfd46..cd11aa5e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nationalarchives/frontend", - "version": "0.2.10", + "version": "0.2.11", "description": "The National Archives frontend styles", "scripts": { "start": "storybook dev -p 6006", diff --git a/src/nationalarchives/components/accordion/accordion.scss b/src/nationalarchives/components/accordion/accordion.scss index 7af9bfbc..bdc42aa3 100644 --- a/src/nationalarchives/components/accordion/accordion.scss +++ b/src/nationalarchives/components/accordion/accordion.scss @@ -97,6 +97,10 @@ border-width: 0 0.5rem #{math.div(math.sqrt(3), 2)}rem 0.5rem; } } + + &:active { + z-index: 1; + } } &__content { diff --git a/src/nationalarchives/utilities/_imports.scss b/src/nationalarchives/utilities/_imports.scss index c2d749c4..1fdac977 100644 --- a/src/nationalarchives/utilities/_imports.scss +++ b/src/nationalarchives/utilities/_imports.scss @@ -53,12 +53,8 @@ " ", "+" ); - @if typography.$import-google-fonts { - @import url("https://fonts.googleapis.com/css2?family=#{$main-font-family-name}:wght@#{typography.$main-font-weight}..#{typography.$main-font-weight-bold}&family=#{$detail-font-family-name}:wght@#{typography.$detail-font-weight}..#{typography.$detail-font-weight-bold}&display=swap"); /* stylelint-disable-line */ - } @else { - @warn "Remember to import the Google Fonts CSS into your application"; - @debug '' + - '' + - ''; /* stylelint-disable-line */ - } + @warn "Remember to import the Google Fonts CSS into your application"; + @debug ''; + @debug ''; + @debug ''; /* stylelint-disable-line */ } diff --git a/src/nationalarchives/variables/_typography.scss b/src/nationalarchives/variables/_typography.scss index 9171c7eb..f261ec8f 100644 --- a/src/nationalarchives/variables/_typography.scss +++ b/src/nationalarchives/variables/_typography.scss @@ -21,17 +21,6 @@ $relative-1rem-px: 16; // 16px = 1rem */ $use-local-fonts: false !default; -/* - * ------------------------------------------ - * When the $use-local-fonts var and this are - * both set to true import the required fonts - * from Google with an @import; if false then - * a separate element for the font CSS - * is required in your app - * ------------------------------------------ - */ -$import-google-fonts: true !default; - $body-font-size-px: 18 !default; $body-font-size-px-mobile: 17 !default; $body-line-height: 1.75 !default;