diff --git a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Atoms/_Heading.scss b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Atoms/_Heading.scss index 015bd62ae..28c63e0ee 100644 --- a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Atoms/_Heading.scss +++ b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Atoms/_Heading.scss @@ -79,6 +79,7 @@ margin-bottom: $half-spacing+px; font-size: $base-font-size*1.3px; line-height: $base-line-height*1px; + font-weight: $regular; @include mq('medium') { font-size: $base-font-size*1.5px; diff --git a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Molecules/_ImageTeaser.scss b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Molecules/_ImageTeaser.scss index 40a241dc0..280b07310 100644 --- a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Molecules/_ImageTeaser.scss +++ b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Molecules/_ImageTeaser.scss @@ -63,6 +63,7 @@ // :last-child { margin-bottom: 0; + margin-right: .3rem; } &:after { diff --git a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Molecules/_Navigation.scss b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Molecules/_Navigation.scss index 7dd694d2e..51b8ab52f 100644 --- a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Molecules/_Navigation.scss +++ b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Molecules/_Navigation.scss @@ -90,7 +90,7 @@ > li { &:first-child { - font-weight: $bold; + font-weight: $regular; } &:after { @@ -135,7 +135,7 @@ > li { &.current { - font-weight: $bold; + font-weight: $regular; } &:after { diff --git a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Organisms/_SiteHeader.scss b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Organisms/_SiteHeader.scss index 81314ff4c..fd062e7a4 100644 --- a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Organisms/_SiteHeader.scss +++ b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Organisms/_SiteHeader.scss @@ -70,7 +70,7 @@ } } .siteHeader__nav { - font-weight: $bold; + font-weight: $regular; font-size: .95em; line-height: $basic-spacing+px; diff --git a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Utilities/_Neos.scss b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Utilities/_Neos.scss index 2c8ad3cbe..537da0dd7 100644 --- a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Utilities/_Neos.scss +++ b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/Utilities/_Neos.scss @@ -4,12 +4,31 @@ } .neos-alignment-left { float: left; + margin-right: .9rem; } .neos-alignment-center { text-align: center; } .neos-alignment-right { - float: right; + float: left; + margin-right: .9rem; + + @media screen and (max-width: 649px) { + .neos-alignment-right { + float: right; + margin-right: 0; + } + } + + figcaption { + margin-left: 0; + + @media screen and (max-width: 649px) { + figcaption { + margin-left: .9rem; + } + } + } } .neos-nodetypes-image { margin-bottom: rs($basic-spacing, $unit: rem); @@ -39,4 +58,4 @@ .ml { display: block !important; } -} \ No newline at end of file +} diff --git a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/_Framework/_Fonts.scss b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/_Framework/_Fonts.scss index 19801dadf..22ae46202 100644 --- a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/_Framework/_Fonts.scss +++ b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/_Framework/_Fonts.scss @@ -10,3 +10,30 @@ $font-path: "../Assets" !default; font-style: normal; font-weight: 400; } +@font-face { + font-family: 'Work Sans'; + font-display: swap; + src: + local("Work Sans"), + url('#{$font-path}/WorkSans-SemiBold.woff2') format('woff2'); + font-style: normal; + font-weight: 600; +} +@font-face { + font-family: 'Work Sans'; + font-display: swap; + src: + local("Work Sans"), + url('#{$font-path}/WorkSans-SemiBoldItalic.woff2') format('woff2'); + font-style: italic; + font-weight: 600; +} +@font-face { + font-family: 'Work Sans'; + font-display: swap; + src: + local("Work Sans"), + url('#{$font-path}/WorkSans-Italic.woff2') format('woff2'); + font-style: italic; + font-weight: 400; +} diff --git a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/_Variables.scss b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/_Variables.scss index e55216492..dffd9b7d2 100644 --- a/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/_Variables.scss +++ b/DistributionPackages/Neos.NeosIo/Resources/Private/Scss/_Variables.scss @@ -42,8 +42,8 @@ $serif-font-family: Georgia, "Times New Roman", Times, serif !default; $mono-font-family: Menlo, Monaco, Consolas, "Courier New", monospace !default; // The font-weights below are used to emphasize written words instead of numbers in your Sass. -$bold: 400 !default; -$regular: 300 !default; +$bold: 600 !default; +$regular: 400 !default; $light: 200 !default; $thin: 100 !default; diff --git a/DistributionPackages/Neos.NeosIo/Resources/Public/Assets/WorkSans-Italic.woff2 b/DistributionPackages/Neos.NeosIo/Resources/Public/Assets/WorkSans-Italic.woff2 new file mode 100644 index 000000000..ea806355f Binary files /dev/null and b/DistributionPackages/Neos.NeosIo/Resources/Public/Assets/WorkSans-Italic.woff2 differ diff --git a/DistributionPackages/Neos.NeosIo/Resources/Public/Assets/WorkSans-SemiBold.woff2 b/DistributionPackages/Neos.NeosIo/Resources/Public/Assets/WorkSans-SemiBold.woff2 new file mode 100644 index 000000000..8dc068c35 Binary files /dev/null and b/DistributionPackages/Neos.NeosIo/Resources/Public/Assets/WorkSans-SemiBold.woff2 differ diff --git a/DistributionPackages/Neos.NeosIo/Resources/Public/Assets/WorkSans-SemiBoldItalic.woff2 b/DistributionPackages/Neos.NeosIo/Resources/Public/Assets/WorkSans-SemiBoldItalic.woff2 new file mode 100644 index 000000000..5386169a0 Binary files /dev/null and b/DistributionPackages/Neos.NeosIo/Resources/Public/Assets/WorkSans-SemiBoldItalic.woff2 differ