Skip to content

Testing GCDS tokens #2113

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

Draft
amazingphilippe wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Testing GCDS tokens #2113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
786f6ed
Testing GCDS tokens
amazingphilippe Mar 14, 2025
8bbe99d
tweaking fonts and spacing with new font sizes
amazingphilippe Mar 18, 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
2 changes: 1 addition & 1 deletion app/assets/javascripts/listEntry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"</div>",
);
ListEntry.prototype.addButtonTemplate = Hogan.compile(
'<button type="button" class="button button-secondary list-entry-add m-0 mb-8 text-smaller leading-tight">{{addAnotherTranslation}} {{listItemName}} ({{entriesLeft}} {{remainingTranslation}})</button>',
'<button type="button" class="button button-secondary list-entry-add m-0 mb-8 text-base leading-tight">{{addAnotherTranslation}} {{listItemName}} ({{entriesLeft}} {{remainingTranslation}})</button>',
);
ListEntry.prototype.getSharedAttributes = function () {
var $inputs = this.$wrapper.find("input"),
Expand Down
54 changes: 27 additions & 27 deletions app/assets/stylesheets/index.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/assets/stylesheets/tailwind/components/api-key.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

.api-key-key {
padding-bottom: 10px;
@apply block font-monospace my-auto mx-0 px-0 pt-0;
@apply block font-mono my-auto mx-0 px-0 pt-0;
}

.api-key-name {
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/tailwind/components/big-number.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
}

.big-number-number {
@apply block text-titlelarge pb-4 font-bold leading-none;
@apply block text-big pb-4 font-bold leading-none;
}

.big-number-dark {
@apply block p-gutterHalf text-white bg-blue;
}

.big-number-label {
@apply text-smaller inline-block;
@apply text-base inline-block;
}

.big-number-status {
@apply text-smaller block text-white bg-green-darker;
@apply text-base block text-white bg-green-darker;
}

.big-number-status:hover > div {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/tailwind/components/browse-list.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}

.browse-list-hint {
@apply text-smaller leading-tight font-normal mt-2 mb-4 mx-0 text-gray-grey1;
@apply text-base leading-tight font-normal mt-2 mb-4 mx-0 text-gray-grey1;
}
/*! purgecss end ignore */
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/tailwind/components/buttons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
a.button:active {
padding: 0.55em 1em 0.45em;
box-shadow: 0 2px 0 theme("colors.blue.border");
@apply no-underline inline-flex items-center text-white text-smaller leading-tight align-top bg-blue min-h-target;
@apply no-underline inline-flex items-center text-white text-base leading-tight align-top bg-blue min-h-target;
}
.button.shadow-none,
a.button.shadow-none,
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/tailwind/components/checkboxes-radios.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.selection-summary__text--folders {
background-size: 39px auto;
background-position: 0px 4px;
@apply bg-folder bg-no-repeat text-smaller font-normal mb-gutterHalf normal-case pt-4 pr-6 pb-2 pl-20;
@apply bg-folder bg-no-repeat text-base font-normal mb-gutterHalf normal-case pt-4 pr-6 pb-2 pl-20;
}
.selection-summary__text--folders:focus {
@apply outline-none;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/tailwind/components/email_sms_message.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
padding-top: 2px;
padding-bottom: 8px;

@apply text-smaller leading-tight font-normal text-gray-grey1 m-0 pb-2;
@apply text-base leading-tight font-normal text-gray-grey1 m-0 pb-2;
}

.email-message {
@apply bg-white;
}

.email-message-table {
@apply text-smaller leading-tight font-normal align-top border-0 border-b border-solid border-b-gray-grey2;
@apply text-base leading-tight font-normal align-top border-0 border-b border-solid border-b-gray-grey2;
}

.email-message-meta td {
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/tailwind/components/file-upload.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}

.js-enabled .file-upload-filename {
@apply text-smaller leading-tight font-bold inline-block pl-gutterHalf;
@apply text-base leading-tight font-bold inline-block pl-gutterHalf;
}

.js-enabled .file-upload-submit {
Expand All @@ -44,7 +44,7 @@
@apply inline-block leading-loose;
}
.js-enabled .file-upload-alternate-link a {
@apply text-smaller leading-tight font-bold;
@apply text-base leading-tight font-bold;
}
/*! purgecss end ignore */
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/tailwind/components/layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.banner-default,
.banner-with-tick,
.banner-default-with-tick {
@apply block relative p-gutterHalf mx-0 mt-gutter mb-gutterHalf clear-both text-left font-bold text-smaller border-4 border-solid border-green leading-tight text-green;
@apply block relative p-gutterHalf mx-0 mt-gutter mb-gutterHalf clear-both text-left font-bold text-base border-4 border-solid border-green leading-tight text-green;
}

.banner:focus,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/tailwind/components/list-entry.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}

.list-entry-remove {
@apply block mb-6 mt-2 static overflow-hidden text-smaller leading-tight;
@apply block mb-6 mt-2 static overflow-hidden text-base leading-tight;
}
@media (min-width: theme("screens.sm")) {
.list-entry-remove {
Expand All @@ -31,7 +31,7 @@
width: 1.6em;
margin: 6px -1.6em 0 0;
left: 10px;
@apply text-smaller relative pointer-events-none float-left font-bold text-gray-grey1;
@apply text-base relative pointer-events-none float-left font-bold text-gray-grey1;
}
/*! purgecss end ignore */
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/tailwind/components/message.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
.folder-heading-folder {
background-size: auto 19px;
background-position: 0px 4px;
@apply inline bg-no-repeat align-top text-smaller min-h-12;
@apply inline bg-no-repeat align-top text-base min-h-12;
}
.folder-heading-folder {
@apply p-0 pl-gutter bg-folderBlackPng bg-folderBlack;
Expand Down
10 changes: 5 additions & 5 deletions app/assets/stylesheets/tailwind/components/navigation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
padding-top: 14px;
padding-bottom: 11px;
max-width: 50%;
@apply text-smaller leading-tight font-bold px-0 inline-block;
@apply text-base leading-tight font-bold px-0 inline-block;
}

.navigation-service-switch {
padding-top: 14px;
padding-bottom: 11px;
@apply text-smaller leading-tight font-normal text-right absolute top-0 right-0 pr-0 pl-gutterHalf;
@apply text-base leading-tight font-normal text-right absolute top-0 right-0 pr-0 pl-gutterHalf;
}
.navigation-service-switch:hover {
@apply underline text-blue-lightblue;
Expand All @@ -52,14 +52,14 @@
.navigation-service-back-to {
padding-top: 14px;
padding-bottom: 11px;
@apply text-smaller leading-tight font-normal pr-gutterHalf pl-0 inline-block no-underline;
@apply text-base leading-tight font-normal pr-gutterHalf pl-0 inline-block no-underline;
}
.navigation-service-back-to:hover {
@apply underline text-blue-lightblue;
}

.navigation li {
@apply text-smaller leading-tight font-normal m-0 list-none;
@apply text-base leading-tight font-normal m-0 list-none;
}
.navigation a {
top: 5px;
Expand All @@ -80,7 +80,7 @@
between selected and unselected states */
left: -0.5px;
letter-spacing: -0.01em;
@apply text-smaller leading-tight font-bold relative;
@apply text-base leading-tight font-bold relative;
}

/* https://github.com/alphagov/product-page-example/blob/master/source/stylesheets/modules/_sub-navigation.scss */
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/tailwind/components/page-footer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
}

.page-footer-delete-link-without-button {
@apply ml-0 inline-block leading-tight text-smaller;
@apply ml-0 inline-block leading-tight text-base;
}

.page-footer-secondary-link {
@apply block mt-gutter w-max-content;
@apply block mt-gutter w-max;
}

.page-footer-right-aligned-link {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/tailwind/components/previous-next-navigation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@apply flex p-gutterHalf no-underline;
}
.previous-and-next-navigation .pagination-part-title {
@apply block text-titlelarge leading-tight font-bold ml-gutterHalf;
@apply block text-title leading-tight font-bold ml-gutterHalf;
}
.previous-and-next-navigation .page a:visited {
@apply text-blue;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/tailwind/components/remaining-messages.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
}

.rm-header {
@apply text-smaller inline-block;
@apply text-base inline-block;
}

.rm-used {
@apply text-titlelarge pb-4 font-bold leading-none;
@apply text-title pb-4 font-bold leading-none;
}

.rm-total {
Expand Down
10 changes: 5 additions & 5 deletions app/assets/stylesheets/tailwind/components/table.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
table th,
table td {
padding: 0.632em 1.05em 0.4743em 0;
@apply leading-tight text-smaller text-left border-solid border-0 border-b-1 border-gray-300 align-baseline;
@apply leading-tight text-base text-left border-solid border-0 border-b-1 border-gray-300 align-baseline;
}
thead th {
@apply font-bold;
Expand Down Expand Up @@ -97,7 +97,7 @@
}
.table-field-index {
width: 15px;
@apply relative text-smaller leading-tight font-bold;
@apply relative text-base leading-tight font-bold;
}
.table-field-index a:before {
content: "";
Expand Down Expand Up @@ -130,7 +130,7 @@
}
.table-field-headings th,
.table-field-headings-visible th {
@apply text-smaller leading-tight font-bold align-baseline;
@apply text-base leading-tight font-bold align-baseline;
}
.dashboard-table .table-field-heading-first,
.dashboard-table .table-field-headings-first,
Expand Down Expand Up @@ -265,10 +265,10 @@

.body-copy-table table th,
.body-copy-table table td {
@apply text-smaller leading-tight font-normal break-words;
@apply text-base leading-tight font-normal break-words;
}
.body-copy-table table thead th {
@apply text-smaller leading-tight font-bold;
@apply text-base leading-tight font-bold;
}

/*
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/tailwind/components/textbox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
.textbox-highlight-mask {
padding: 4px;
line-height: 1.31579; /* to match code that hasn't been ported yet */
@apply text-smaller block box-border relative m-0 overflow-hidden;
@apply text-base block box-border relative m-0 overflow-hidden;
}

.textbox-highlight-background {
Expand All @@ -26,7 +26,7 @@

.extra-tracking .form-control {
letter-spacing: 0.04em;
@apply pl-2 text-smaller leading-tight font-body;
@apply pl-2 text-base leading-tight font-body;
}

@media (min-width: theme("screens.md")) {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/tailwind/components/tick-cross.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
background-position: 0 6px;
padding: 6px 0 5px 25px;
background-size: 19px 19px;
@apply text-smaller leading-tight font-normal inline-block bg-no-repeat;
@apply text-base leading-tight font-normal inline-block bg-no-repeat;
}

.tick-cross-tick {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/tailwind/components/tou-dialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*! purgecss start ignore */

dialog {
@apply text-smaller;
@apply text-base;
}

.dialog-content:focus {
Expand Down
Loading
Loading