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

Introduction of new spacing grid #3285

Merged
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
c709dfd
change in pixels
SriHV Jul 16, 2024
aa025e3
updated utility classes matrix
alessioventuriniAND Jul 16, 2024
6c718c8
updated html base font size
alessioventuriniAND Jul 17, 2024
49a8228
implemented new grid
alessioventuriniAND Jul 19, 2024
9e181e6
added font size to body
alessioventuriniAND Jul 26, 2024
e2655f8
Merge branch 'main' into enhancement/69/change-utility-classes-to-8px…
alessioventuriniAND Jul 26, 2024
610f4d0
first version done
alessioventuriniAND Jul 30, 2024
9f2115a
second draft completed
alessioventuriniAND Aug 1, 2024
f0f9116
completed line height work
alessioventuriniAND Aug 5, 2024
8433069
fixed incorrect margin
alessioventuriniAND Aug 6, 2024
03a853c
merged main into branch
alessioventuriniAND Aug 6, 2024
44a15f7
test fixed
alessioventuriniAND Aug 6, 2024
dad1c76
all tests and issues fixed
alessioventuriniAND Aug 6, 2024
ee70da7
updated type scale example
alessioventuriniAND Aug 7, 2024
36f4354
merged major release and solved all conflicts
alessioventuriniAND Sep 18, 2024
a1cbf4e
fixed input
alessioventuriniAND Sep 18, 2024
6e0d828
update
precious-onyenaucheya-ons Sep 18, 2024
5130534
update css to mach new grid
precious-onyenaucheya-ons Sep 19, 2024
02499b7
completed some components restyle
alessioventuriniAND Sep 19, 2024
0af6991
Merge branch 'enhancement/69/change-utility-classes-to-8px-grid' of g…
alessioventuriniAND Sep 19, 2024
60811d4
update access code pattern
precious-onyenaucheya-ons Sep 20, 2024
d2816a8
update padding for select component
precious-onyenaucheya-ons Sep 20, 2024
26e77f0
need to work on upload
alessioventuriniAND Sep 20, 2024
0317421
updated vr snapshots
alessioventuriniAND Sep 23, 2024
e5e4e67
snapshots updated
alessioventuriniAND Sep 23, 2024
ae326a4
Merge branch 'major-release' into enhancement/69/change-utility-class…
alessioventuriniAND Sep 23, 2024
1428942
Merge branch 'major-release' into enhancement/69/change-utility-class…
alessioventuriniAND Sep 23, 2024
fac8539
Merge branch 'major-release' into enhancement/69/change-utility-class…
alessioventuriniAND Sep 25, 2024
c603402
updated access code button margin
alessioventuriniAND Sep 25, 2024
68fa443
updated access code button margin
alessioventuriniAND Sep 25, 2024
f2e150f
updated access code button margin
alessioventuriniAND Sep 25, 2024
6640fc5
update
precious-onyenaucheya-ons Sep 30, 2024
d419d0d
remove utility class extension in scss files
precious-onyenaucheya-ons Sep 30, 2024
28f266e
address PR comments
precious-onyenaucheya-ons Sep 30, 2024
86ab2a3
update icon size and font size to match margin sizes
precious-onyenaucheya-ons Oct 1, 2024
bc79cb9
revert changes to grid sizes
precious-onyenaucheya-ons Oct 1, 2024
4970ac2
fix issue with button
precious-onyenaucheya-ons Oct 2, 2024
a747964
fix issue with pipeline
precious-onyenaucheya-ons Oct 2, 2024
ac66f09
remove commented code
precious-onyenaucheya-ons Oct 2, 2024
c34c907
Merge branch 'major-release' into enhancement/69/change-utility-class…
rmccar Oct 3, 2024
0e0a3e5
revert changes made to yarn lock file
precious-onyenaucheya-ons Oct 3, 2024
9bf74e5
address PR comments
precious-onyenaucheya-ons Oct 3, 2024
35c02a4
approve visual tests
precious-onyenaucheya-ons Oct 3, 2024
652c7ab
fix issue with warning panel
precious-onyenaucheya-ons Oct 3, 2024
ddc47ad
update migration guide
precious-onyenaucheya-ons Oct 4, 2024
a362cfd
update scss files as per comments
precious-onyenaucheya-ons Oct 4, 2024
4246818
update
precious-onyenaucheya-ons Oct 4, 2024
d20ba06
update migration guide
precious-onyenaucheya-ons Oct 4, 2024
8e973ca
update grid breakpoints and migration guide
precious-onyenaucheya-ons Oct 4, 2024
1ba0203
update as per PR comments
precious-onyenaucheya-ons Oct 7, 2024
f7e4185
Update migration_guides/70.x.x-to-71.0.0-migration-guide.md
precious-onyenaucheya-ons Oct 7, 2024
9389b87
Update migration_guides/70.x.x-to-71.0.0-migration-guide.md
precious-onyenaucheya-ons Oct 7, 2024
ae2b2f0
Update migration_guides/70.x.x-to-71.0.0-migration-guide.md
precious-onyenaucheya-ons Oct 7, 2024
ab5ff69
Update migration_guides/70.x.x-to-71.0.0-migration-guide.md
precious-onyenaucheya-ons Oct 7, 2024
ed76dc8
updates to spacing
rmccar Oct 8, 2024
c4145f7
fix accordion spacing
rmccar Oct 8, 2024
0387602
Merge branch 'major-release' into enhancement/69/change-utility-class…
rmccar Oct 8, 2024
b349264
vr test updates
rmccar Oct 8, 2024
dea2b69
Merge branch 'enhancement/69/change-utility-classes-to-8px-grid' of g…
rmccar Oct 8, 2024
37dc6d3
Merge branch 'major-release' into enhancement/69/change-utility-class…
rmccar Oct 8, 2024
e276605
fix another padding issue
rmccar Oct 8, 2024
fa93327
vr test updates
rmccar Oct 8, 2024
b7443a2
Merge branch 'major-release' into enhancement/69/change-utility-class…
rmccar Oct 8, 2024
4daeeaf
Merge branch 'enhancement/69/change-utility-classes-to-8px-grid' of g…
rmccar Oct 8, 2024
1588baf
Merge branch 'major-release' into enhancement/69/change-utility-class…
rmccar Oct 8, 2024
cc4b57f
align nav links to grid
rmccar Oct 8, 2024
01f9681
resize ons logos
rmccar Oct 8, 2024
ec7bd8a
Merge branch 'enhancement/69/change-utility-classes-to-8px-grid' of g…
rmccar Oct 8, 2024
e4f88f6
input height on grid
rmccar Oct 8, 2024
cf1a2ea
interviewer note border
rmccar Oct 8, 2024
007e513
related content
rmccar Oct 8, 2024
b4538d5
status
rmccar Oct 8, 2024
fd891fc
update snapshot test
rmccar Oct 8, 2024
8838e2e
fix underline button in footer
rmccar Oct 8, 2024
a6c3f54
revert
rmccar Oct 8, 2024
33e2cca
update vr tests
rmccar Oct 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 15 additions & 15 deletions __snapshots__/layout/_template.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `

<div class="ons-phase-banner">
<div class="ons-container">
<div class="ons-grid ons-grid-flex ons-grid--gutterless ons-grid-flex--vertical-top ons-grid-flex--no-wrap">
<div class="ons-grid ons-grid-flex ons-grid--gutterless ons-grid-flex--vertical-center ons-grid-flex--no-wrap">

<div class="ons-grid__col ons-col-auto ons-u-flex-no-grow ons-u-flex-no-shrink">
<strong class="ons-phase-banner__badge">BETA</strong>
Expand Down Expand Up @@ -827,7 +827,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `


<button type="button" class="ons-btn ons-u-d-no ons-js-toggle-services ons-btn--mobile ons-btn--neutral" aria-label="Toggle services menu" aria-controls="service-links" aria-expanded="false">
<span class="ons-btn__inner"><span class="ons-btn__text">Account</span><svg class="ons-icon ons-u-ml-xs" viewBox="0 0 8 13" xmlns="http://www.w3.org/2000/svg" focusable="false" fill="currentColor" role="img" title="ons-icon-chevron">
<span class="ons-btn__inner"><span class="ons-btn__text">Account</span><svg class="ons-icon ons-u-ml-2xs" viewBox="0 0 8 13" xmlns="http://www.w3.org/2000/svg" focusable="false" fill="currentColor" role="img" title="ons-icon-chevron">
<path d="M5.74,14.28l-.57-.56a.5.5,0,0,1,0-.71h0l5-5-5-5a.5.5,0,0,1,0-.71h0l.57-.56a.5.5,0,0,1,.71,0h0l5.93,5.93a.5.5,0,0,1,0,.7L6.45,14.28a.5.5,0,0,1-.71,0Z" transform="translate(-5.02 -1.59)"></path>
</svg></span>

Expand Down Expand Up @@ -927,7 +927,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `


<button type="submit" class="ons-btn ons-u-d-no@xxs@l ons-btn--ghost-dark">
<span class="ons-btn__inner"><span class="ons-btn__text">Save and sign out</span><svg class="ons-icon ons-u-ml-xs" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg" focusable="false" fill="currentColor" role="img" title="ons-icon-exit">
<span class="ons-btn__inner"><span class="ons-btn__text">Save and sign out</span><svg class="ons-icon ons-u-ml-2xs" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg" focusable="false" fill="currentColor" role="img" title="ons-icon-exit">
<path d="M13.85,7.65l-2.5-2.5a.5.5,0,0,0-.71,0,.48.48,0,0,0-.15.36V7h-3a.5.5,0,0,0-.5.5v1a.5.5,0,0,0,.5.5h3v1.5A.49.49,0,0,0,11,11a.48.48,0,0,0,.34-.14l2.51-2.5a.49.49,0,0,0,0-.68Z" transform="translate(-2 -2)"></path>
<path d="M8.5,14h-6a.5.5,0,0,1-.5-.5V2.5A.5.5,0,0,1,2.5,2h6a.5.5,0,0,1,.5.5V3a.5.5,0,0,1-.5.5h-5v9h5A.5.5,0,0,1,9,13v.5A.5.5,0,0,1,8.5,14Z" transform="translate(-2 -2)"></path>
</svg></span>
Expand Down Expand Up @@ -966,8 +966,8 @@ exports[`base page template matches the full configuration snapshot 1`] = `



<button type="submit" class="ons-btn ons-u-ml-xs ons-u-d-no ons-js-navigation-button ons-u-d-no@l ons-btn--mobile ons-btn--ghost" aria-label="Toggle main menu" aria-controls="main-nav" aria-expanded="false">
<span class="ons-btn__inner"><span class="ons-btn__text">Menu</span><svg class="ons-icon ons-u-ml-xs" viewBox="0 0 8 13" xmlns="http://www.w3.org/2000/svg" focusable="false" fill="currentColor" role="img" title="ons-icon-chevron">
<button type="submit" class="ons-btn ons-u-ml-2xs ons-u-d-no ons-js-navigation-button ons-u-d-no@l ons-btn--mobile ons-btn--ghost" aria-label="Toggle main menu" aria-controls="main-nav" aria-expanded="false">
<span class="ons-btn__inner"><span class="ons-btn__text">Menu</span><svg class="ons-icon ons-u-ml-2xs" viewBox="0 0 8 13" xmlns="http://www.w3.org/2000/svg" focusable="false" fill="currentColor" role="img" title="ons-icon-chevron">
<path d="M5.74,14.28l-.57-.56a.5.5,0,0,1,0-.71h0l5-5-5-5a.5.5,0,0,1,0-.71h0l.57-.56a.5.5,0,0,1,.71,0h0l5.93,5.93a.5.5,0,0,1,0,.7L6.45,14.28a.5.5,0,0,1-.71,0Z" transform="translate(-5.02 -1.59)"></path>
</svg></span>

Expand Down Expand Up @@ -1102,15 +1102,15 @@ exports[`base page template matches the full configuration snapshot 1`] = `


<button type="button" class="ons-btn ons-u-d-no ons-js-sub-navigation-button ons-btn--mobile ons-btn--dropdown" aria-label="Toggle Design system menu" aria-controls="sub-nav" aria-expanded="false">
<span class="ons-btn__inner"><span class="ons-btn__text">Design system</span><svg class="ons-icon ons-u-ml-xs" viewBox="0 0 8 13" xmlns="http://www.w3.org/2000/svg" focusable="false" fill="currentColor" role="img" title="ons-icon-chevron">
<span class="ons-btn__inner"><span class="ons-btn__text">Design system</span><svg class="ons-icon ons-u-ml-2xs" viewBox="0 0 8 13" xmlns="http://www.w3.org/2000/svg" focusable="false" fill="currentColor" role="img" title="ons-icon-chevron">
<path d="M5.74,14.28l-.57-.56a.5.5,0,0,1,0-.71h0l5-5-5-5a.5.5,0,0,1,0-.71h0l.57-.56a.5.5,0,0,1,.71,0h0l5.93,5.93a.5.5,0,0,1,0,.7L6.45,14.28a.5.5,0,0,1-.71,0Z" transform="translate(-5.02 -1.59)"></path>
</svg></span>



</button>

<nav class="ons-navigation ons-navigation--sub-mobile ons-u-d-no ons-js-secondary-nav ons-u-mt-xs" id="sub-nav--mobile" aria-hidden="true" aria-label="Section menu" data-analytics="header-section-navigation">
<nav class="ons-navigation ons-navigation--sub-mobile ons-u-d-no ons-js-secondary-nav ons-u-mt-2xs" id="sub-nav--mobile" aria-hidden="true" aria-label="Section menu" data-analytics="header-section-navigation">
<div class="ons-container ons-container--gutterless@xxs@l">
<ul class="ons-navigation__list ons-navigation__list--parent">
<li class="ons-navigation__item">
Expand Down Expand Up @@ -1155,7 +1155,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `

<h3 class="ons-navigation__list-header">Ask users for...</h3>

<ul class="ons-navigation__list ons-navigation__list--child ons-list--dashed ons-u-ml-s ons-u-mt-xs">
<ul class="ons-navigation__list ons-navigation__list--child ons-list--dashed ons-u-ml-s ons-u-mt-2xs">

<li class="ons-navigation__item ons-list__item ons-navigation__item--active">
<a class="ons-navigation__link ons-navigation__link--section" href="#access-codes">
Expand Down Expand Up @@ -1218,7 +1218,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `

<h3 class="ons-navigation__list-header">Help users to...</h3>

<ul class="ons-navigation__list ons-navigation__list--child ons-list--dashed ons-u-ml-s ons-u-mt-xs">
<ul class="ons-navigation__list ons-navigation__list--child ons-list--dashed ons-u-ml-s ons-u-mt-2xs">

<li class="ons-navigation__item ons-list__item">
<a class="ons-navigation__link ons-navigation__link--section" href="#0">
Expand Down Expand Up @@ -1358,7 +1358,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `


<button type="submit" class="ons-btn ons-btn--ghost">
<span class="ons-btn__inner"><span class="ons-btn__text">Save and sign out</span><svg class="ons-icon ons-u-ml-xs" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg" focusable="false" fill="currentColor" role="img" title="ons-icon-exit">
<span class="ons-btn__inner"><span class="ons-btn__text">Save and sign out</span><svg class="ons-icon ons-u-ml-2xs" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg" focusable="false" fill="currentColor" role="img" title="ons-icon-exit">
<path d="M13.85,7.65l-2.5-2.5a.5.5,0,0,0-.71,0,.48.48,0,0,0-.15.36V7h-3a.5.5,0,0,0-.5.5v1a.5.5,0,0,0,.5.5h3v1.5A.49.49,0,0,0,11,11a.48.48,0,0,0,.34-.14l2.51-2.5a.49.49,0,0,0,0-.68Z" transform="translate(-2 -2)"></path>
<path d="M8.5,14h-6a.5.5,0,0,1-.5-.5V2.5A.5.5,0,0,1,2.5,2h6a.5.5,0,0,1,.5.5V3a.5.5,0,0,1-.5.5h-5v9h5A.5.5,0,0,1,9,13v.5A.5.5,0,0,1,8.5,14Z" transform="translate(-2 -2)"></path>
</svg></span>
Expand Down Expand Up @@ -1447,7 +1447,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `
</div>

<!-- Full footer columns -->
<div class="ons-grid__col ons-col-4@m ons-u-mt-m@xxs@m">
<div class="ons-grid__col ons-col-4@m ons-u-mt-l@xxs@m">

<h2 class="ons-footer__heading ons-u-fs-r--b">About ONS</h2>

Expand Down Expand Up @@ -1516,7 +1516,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `
</div>

<!-- Full footer columns -->
<div class="ons-grid__col ons-col-4@m ons-u-mt-m@xxs@m">
<div class="ons-grid__col ons-col-4@m ons-u-mt-l@xxs@m">

<h2 class="ons-footer__heading ons-u-fs-r--b">Statistics</h2>

Expand Down Expand Up @@ -1594,7 +1594,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `



<div class="ons-grid__col ons-u-mb-m">
<div class="ons-grid__col ons-u-mb-l">
<hr class="ons-footer__hr">
</div>

Expand Down Expand Up @@ -1686,7 +1686,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `


<!-- OGL -->
<div class="ons-footer__license ons-u-mb-m"><svg class="ons-footer__ogl-img" xmlns="http://www.w3.org/2000/svg" width="50px" height="20px" viewBox="0 0 60 24" focusable="false" aria-hidden="true" role="img">
<div class="ons-footer__license ons-u-mb-l"><svg class="ons-footer__ogl-img" xmlns="http://www.w3.org/2000/svg" width="50px" height="20px" viewBox="0 0 60 24" focusable="false" aria-hidden="true" role="img">
<title>Open Government License logo</title>
<path d="M51.7,17.5V0l-6.2,4v19.8h13.8v-6.2H51.7z M36.7,16.3c-1,0.9-2.4,1.4-3.8,1.4c-3.2,0-5.8-2.6-5.8-5.8s2.6-5.8,5.8-5.8c2,0,3.9,1.1,4.9,2.7L43,5.6C40.9,2.2,37.1,0,32.9,0c-4.5,0-8.4,2.5-10.4,6.1C20.4,2.5,16.5,0,12,0C5.4,0,0,5.4,0,12s5.4,12,12,12c4.5,0,8.4-2.5,10.4-6.1c2.1,3.6,6,6.1,10.4,6.1c3,0,5.8-1.1,7.9-3l2.4,2.7h0.4V13h-9.8L36.7,16.3zM12,17.8c-3.2,0-5.8-2.6-5.8-5.8S8.8,6.2,12,6.2s5.8,2.6,5.8,5.8S15.2,17.8,12,17.8" fill="#595959"></path>
</svg>
Expand All @@ -1711,7 +1711,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `



<div class="ons-footer__logo-container ons-u-mb-m ons-grid-flex ons-grid-flex--vertical-top">
<div class="ons-footer__logo-container ons-u-mb-l ons-grid-flex ons-grid-flex--vertical-top">
<a class="ons-footer__logo-link" href="https://www.ons.gov.uk/">
<svg class="ons-icon--logo" xmlns="http://www.w3.org/2000/svg" width="197" height="19" viewBox="33 2 552 60" aria-labelledby="ons-logo-en-footer-alt" role="img">
<title id="ons-logo-en-footer-alt">
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading