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

fuss with font size on flex pages #2656

Merged
merged 2 commits into from
Aug 6, 2024
Merged

fuss with font size on flex pages #2656

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
9c7a154
fuss with font size on flex pages
TomWoodward Jul 31, 2024
0861e7f
Merge branch 'main' into fussing-with-font-size
TomWoodward Aug 1, 2024
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
6 changes: 6 additions & 0 deletions src/app/pages/flex-page/blocks/CTABlock.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
> a:nth-of-type(1):not(.styled-button) {
@include button();
@extend %primary;
@include body-font(2rem);
}
> a:nth-of-type(2):not(.styled-button) {
@include button();
background-color: ui-color(white);
@include body-font(2rem);
}
}

Expand All @@ -23,22 +25,26 @@
&.style-orange {
@include button();
@extend %primary;
@include body-font(2rem);
}

&.style-white {
@include button();
background-color: ui-color(white);
@include body-font(2rem);
}

&.style-blue_outline {
@include button();
background-color: ui-color(white);
border-color: os-color(blue);
@include body-font(2rem);
}

&.style-deep_green_outline {
@include button();
background-color: ui-color(white);
border-color: os-color(deep-green);
@include body-font(2rem);
}
}
4 changes: 4 additions & 0 deletions src/app/pages/flex-page/blocks/CardsBlock.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,8 @@
box-shadow: 0 -1rem 0 os-color(red);
}
}

h2, h3 {
@include scale-set-font(h4, h3);
}
}
1 change: 1 addition & 0 deletions src/app/pages/flex-page/blocks/LinksBlock.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

> a {
@include button();
@include body-font(2rem);
white-space: break-spaces;
padding: 1.5rem;
height: auto;
Expand Down
13 changes: 2 additions & 11 deletions src/app/pages/flex-page/blocks/RichTextBlock.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,8 @@
margin-top: 0;
}

h1 {
@include title-font(4.8rem);
}
h2 {
@include title-font(2.6rem);
}
h3 {
@include title-font(1.8rem);
}
h4, h5, h6 {
@include title-font(1.6rem);
h5, h6 {
@extend %text-h4;
Copy link
Contributor

Choose a reason for hiding this comment

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

I had forgotten about the %text- stuff! Same as @include set-font(h4) if you prefer @include.

Copy link
Member Author

Choose a reason for hiding this comment

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

i copied this out of the pattern library sass, i don't really care either way

}

p {
Expand Down
Loading