Skip to content
Snippets Groups Projects
Commit 75c1fd7a authored by Ekaterina Kondareva's avatar Ekaterina Kondareva
Browse files

Merge branch 'NXSTAGE-1249-h2-styles' into 'development'

Nxstage 1249 h2 styles

See merge request julkiset-sivut/design-system-lib!124
parents 1b4a294d 43f4fe37
No related branches found
No related tags found
No related merge requests found
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
padding: 1.5rem 0 1rem; padding: 1.5rem 0 1rem;
@include breakpoint($narrow) { @include breakpoint($narrow) {
padding: 2rem 0 1.5rem; padding: 2rem 0 1rem;
} }
} }
...@@ -78,39 +78,37 @@ ...@@ -78,39 +78,37 @@
&:after { &:after {
background-color: transparent; background-color: transparent;
border-bottom: 1px solid var(--grayscale-dark); border-bottom: 3px solid var(--grayscale-dark);
content: ' '; content: ' ';
display: flex; display: flex;
height: 2px; height: 2px;
width: 100%; width: 100%;
margin-left: 0; margin-left: 0;
margin-bottom: 1rem; margin-bottom: 0.5rem;
position: relative; position: relative;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
@include breakpoint($narrow) { @include breakpoint($narrow) {
margin-left: 2rem; margin-left: 2rem;
border-bottom: 1px solid var(--grayscale-dark);
margin-bottom: 1rem;
} }
} }
} }
// H2 used in landing pages and in Introduction paragraph: caps, bigger font. // H2 used in landing pages and in Introduction paragraph: caps, bigger font.
// These styles are applied if there is a Sidebar on the page in Desktop sizes
h2.hy-heading__introduction, h2.hy-heading__introduction,
h2.hy-heading__landingsection { h2.hy-heading__landingsection {
@include font-size(28px, 32px); @include font-size(28px, 28px);
letter-spacing: -0.88px; @include font-weight($bold);
letter-spacing: -1px;
text-transform: uppercase; text-transform: uppercase;
@include breakpoint($narrow) { @include breakpoint($narrow) {
// > 480px
@include font-size(40px, 40px);
letter-spacing: -1.25px;
}
@include breakpoint($wide) {
// H2 for front page and landing page, Medium size
@include font-size(40px, 40px); @include font-size(40px, 40px);
letter-spacing: -1.25px; letter-spacing: -1.3px;
} }
} }
...@@ -156,15 +154,10 @@ h1.hy-heading__introduction { ...@@ -156,15 +154,10 @@ h1.hy-heading__introduction {
h2.hy-heading__introduction, h2.hy-heading__introduction,
h2.hy-heading__landingsection { h2.hy-heading__landingsection {
@include breakpoint($extrawide) { @include breakpoint($extrawide) {
// > 1200px
// ex. Side menu layout on Mid-sized desktop; Medium font
@include font-size(40px, 40px); @include font-size(40px, 40px);
letter-spacing: -1.25px; letter-spacing: -1.3px;
} }
@include breakpoint($xlarge) { @include breakpoint($xlarge) {
// > 1441px
// ex. Side menu layout on Large desktop; Large font
@include font-size(48px, 48px); @include font-size(48px, 48px);
letter-spacing: -1.6px; letter-spacing: -1.6px;
} }
...@@ -179,6 +172,20 @@ h1.hy-heading__introduction { ...@@ -179,6 +172,20 @@ h1.hy-heading__introduction {
padding: 0 0 1rem; padding: 0 0 1rem;
} }
} }
h2.hy-heading__landingsection,
h2.hy-heading__contentsection {
padding-bottom: 1.5rem;
@include breakpoint($narrow) {
padding-bottom: 1.75rem;
}
@include breakpoint($wide) {
padding-bottom: 2rem;
}
@include breakpoint($xlarge) {
padding-bottom: 2.5rem;
}
}
} }
// Applied when there is NO sidebar // Applied when there is NO sidebar
...@@ -186,17 +193,12 @@ h1.hy-heading__introduction { ...@@ -186,17 +193,12 @@ h1.hy-heading__introduction {
h2.hy-heading__introduction, h2.hy-heading__introduction,
h2.hy-heading__landingsection { h2.hy-heading__landingsection {
@include breakpoint($extrawide) { @include breakpoint($extrawide) {
// > 1200px
// ex. Full width layout on Mid-sized desktop; Large font
@include font-size(48px, 48px); @include font-size(48px, 48px);
letter-spacing: -1.6px; letter-spacing: -1.6px;
} }
@include breakpoint($xlarge) { @include breakpoint($xlarge) {
// > 1400px @include font-size(48px, 48px);
// ex. Full width layout on Large desktop; X-large font letter-spacing: -1.6px;
@include font-size(54px, 54px);
letter-spacing: -1.8px;
} }
} }
...@@ -212,6 +214,20 @@ h1.hy-heading__introduction { ...@@ -212,6 +214,20 @@ h1.hy-heading__introduction {
} }
} }
h2.hy-heading__landingsection,
h2.hy-heading__contentsection {
padding-bottom: 1.5rem;
@include breakpoint($narrow) {
padding-bottom: 1.75rem;
}
@include breakpoint($wide) {
padding-bottom: 2rem;
}
@include breakpoint($extrawide) {
padding-bottom: 2.5rem;
}
}
//Hero h1 //Hero h1
h1.hy-heading__introduction { h1.hy-heading__introduction {
@include breakpoint($extrawide) { @include breakpoint($extrawide) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment