diff --git a/src/assets/fonts/Antonio-Bold.woff b/src/assets/fonts/Antonio-Bold.woff deleted file mode 100644 index 55d62bec20..0000000000 Binary files a/src/assets/fonts/Antonio-Bold.woff and /dev/null differ diff --git a/src/assets/fonts/Antonio-Bold.woff2 b/src/assets/fonts/Antonio-Bold.woff2 deleted file mode 100644 index de263be85e..0000000000 Binary files a/src/assets/fonts/Antonio-Bold.woff2 and /dev/null differ diff --git a/src/assets/fonts/Antonio-Light.woff b/src/assets/fonts/Antonio-Light.woff deleted file mode 100644 index d5ae3edd96..0000000000 Binary files a/src/assets/fonts/Antonio-Light.woff and /dev/null differ diff --git a/src/assets/fonts/Antonio-Light.woff2 b/src/assets/fonts/Antonio-Light.woff2 deleted file mode 100644 index 7bce626775..0000000000 Binary files a/src/assets/fonts/Antonio-Light.woff2 and /dev/null differ diff --git a/src/assets/fonts/Antonio-Regular.woff b/src/assets/fonts/Antonio-Regular.woff deleted file mode 100644 index 21eb741795..0000000000 Binary files a/src/assets/fonts/Antonio-Regular.woff and /dev/null differ diff --git a/src/assets/fonts/Antonio-Regular.woff2 b/src/assets/fonts/Antonio-Regular.woff2 deleted file mode 100644 index 9809b9d8ab..0000000000 Binary files a/src/assets/fonts/Antonio-Regular.woff2 and /dev/null differ diff --git a/src/assets/fonts/antonio-bold.woff b/src/assets/fonts/antonio-bold.woff deleted file mode 100644 index 55d62bec20..0000000000 Binary files a/src/assets/fonts/antonio-bold.woff and /dev/null differ diff --git a/src/assets/fonts/antonio-bold.woff2 b/src/assets/fonts/antonio-bold.woff2 deleted file mode 100644 index de263be85e..0000000000 Binary files a/src/assets/fonts/antonio-bold.woff2 and /dev/null differ diff --git a/src/assets/fonts/antonio-light.woff b/src/assets/fonts/antonio-light.woff deleted file mode 100644 index d5ae3edd96..0000000000 Binary files a/src/assets/fonts/antonio-light.woff and /dev/null differ diff --git a/src/assets/fonts/antonio-light.woff2 b/src/assets/fonts/antonio-light.woff2 deleted file mode 100644 index 7bce626775..0000000000 Binary files a/src/assets/fonts/antonio-light.woff2 and /dev/null differ diff --git a/src/assets/fonts/antonio-regular.woff b/src/assets/fonts/antonio-regular.woff deleted file mode 100644 index 21eb741795..0000000000 Binary files a/src/assets/fonts/antonio-regular.woff and /dev/null differ diff --git a/src/assets/fonts/antonio-regular.woff2 b/src/assets/fonts/antonio-regular.woff2 deleted file mode 100644 index 9809b9d8ab..0000000000 Binary files a/src/assets/fonts/antonio-regular.woff2 and /dev/null differ diff --git a/src/assets/fonts/antonio-v11-bold.ttf b/src/assets/fonts/antonio-v11-bold.ttf new file mode 100644 index 0000000000..6aaac51b1f Binary files /dev/null and b/src/assets/fonts/antonio-v11-bold.ttf differ diff --git a/src/assets/fonts/antonio-v11-bold.woff b/src/assets/fonts/antonio-v11-bold.woff new file mode 100644 index 0000000000..194b7c7f9f Binary files /dev/null and b/src/assets/fonts/antonio-v11-bold.woff differ diff --git a/src/assets/fonts/antonio-v11-bold.woff2 b/src/assets/fonts/antonio-v11-bold.woff2 new file mode 100644 index 0000000000..faee33c3d6 Binary files /dev/null and b/src/assets/fonts/antonio-v11-bold.woff2 differ diff --git a/src/assets/fonts/antonio-v11-light.ttf b/src/assets/fonts/antonio-v11-light.ttf new file mode 100644 index 0000000000..c34905f144 Binary files /dev/null and b/src/assets/fonts/antonio-v11-light.ttf differ diff --git a/src/assets/fonts/antonio-v11-light.woff b/src/assets/fonts/antonio-v11-light.woff new file mode 100644 index 0000000000..194b2334c1 Binary files /dev/null and b/src/assets/fonts/antonio-v11-light.woff differ diff --git a/src/assets/fonts/antonio-v11-light.woff2 b/src/assets/fonts/antonio-v11-light.woff2 new file mode 100644 index 0000000000..0b38c3db70 Binary files /dev/null and b/src/assets/fonts/antonio-v11-light.woff2 differ diff --git a/src/assets/fonts/antonio-v11-regular.ttf b/src/assets/fonts/antonio-v11-regular.ttf new file mode 100644 index 0000000000..b1d1bf983f Binary files /dev/null and b/src/assets/fonts/antonio-v11-regular.ttf differ diff --git a/src/assets/fonts/antonio-v11-regular.woff b/src/assets/fonts/antonio-v11-regular.woff new file mode 100644 index 0000000000..9e31e090a3 Binary files /dev/null and b/src/assets/fonts/antonio-v11-regular.woff differ diff --git a/src/assets/fonts/antonio-v11-regular.woff2 b/src/assets/fonts/antonio-v11-regular.woff2 new file mode 100644 index 0000000000..46aaafdd34 Binary files /dev/null and b/src/assets/fonts/antonio-v11-regular.woff2 differ diff --git a/src/assets/scss/_local-fonts.scss b/src/assets/scss/_local-fonts.scss index c7910ab691..1cc49e8d9d 100755 --- a/src/assets/scss/_local-fonts.scss +++ b/src/assets/scss/_local-fonts.scss @@ -1,26 +1,29 @@ @font-face { font-family: 'Antonio'; - src: url('../fonts/antonio-bold.woff2') format('woff2'), - url('../fonts/antonio-bold.woff') format('woff'); - font-weight: normal; + src: url('../fonts/antonio-v11-bold.woff2') format('woff2'), + url('../fonts/antonio-v11-bold.woff') format('woff'), + url('../fonts/antonio-v11-bold.ttf') format('truetype'); /* Safari, Android, iOS */ + font-weight: 700; font-style: normal; font-display: swap; } @font-face { font-family: 'Antonio'; - src: url('../fonts/antonio-light.woff2') format('woff2'), - url('../fonts/antonio-light.woff') format('woff'); - font-weight: normal; + src: url('../fonts/antonio-v11-light.woff2') format('woff2'), + url('../fonts/antonio-v11-light.woff') format('woff'), + url('../fonts/antonio-v11-light.ttf') format('truetype'); /* Safari, Android, iOS */ + font-weight: 100; font-style: normal; font-display: swap; } @font-face { font-family: 'Antonio'; - src: url('../fonts/antonio-regular.woff2') format('woff2'), - url('../fonts/antonio-regular.woff') format('woff'); - font-weight: normal; + src: url('../fonts/antonio-v11-regular.woff2') format('woff2'), + url('../fonts/antonio-v11-regular.woff') format('woff'), + url('../fonts/antonio-v11-regular.ttf') format('truetype'); /* Safari, Android, iOS */ + font-weight: 400; font-style: normal; font-display: swap; } @@ -326,3 +329,17 @@ font-style: italic; font-display: swap; } + +@font-face { + font-family: "Antonio-fallback"; + text-transform: uppercase; + size-adjust: 99%; + src: local("Arial Narrow"); +} + +@font-face { + font-family: "Zilla-fallback"; + size-adjust: 93%; + ascent-override: 99%; + src: local("Georgia"); +} diff --git a/src/assets/scss/_utilities.scss b/src/assets/scss/_utilities.scss index 6558f85d71..293a0b1ad8 100755 --- a/src/assets/scss/_utilities.scss +++ b/src/assets/scss/_utilities.scss @@ -322,7 +322,7 @@ text-transform: uppercase; line-height: 1.4; font-size: 1.25rem; - padding: 1rem 2rem 1rem; + padding: 1rem 2rem 1.2rem; -webkit-font-smoothing: auto; -moz-osx-font-smoothing: auto; diff --git a/src/assets/scss/_variables.scss b/src/assets/scss/_variables.scss index d538cac8ba..ab3c395ff2 100755 --- a/src/assets/scss/_variables.scss +++ b/src/assets/scss/_variables.scss @@ -47,9 +47,9 @@ $border-width: 1px; // Typography $font-family-sans-serif: 'Roboto', sans-serif; -$font-family-serif: 'Zilla Slab', serif; +$font-family-serif: 'Zilla Slab', 'Zilla-fallback', serif; $font-family-serif-alt: 'Lora', serif; -$font-family-caps: 'Antonio', sans-serif; +$font-family-caps: 'Antonio', 'Antonio-fallback', sans-serif; $font-family-caps-light: 'Antonio', sans-serif; $font-family-caps-bold: 'Antonio', sans-serif; $font-family-script: 'amnestyscript'; diff --git a/src/assets/scss/uids.scss b/src/assets/scss/uids.scss index 89f6a55b49..7cebaabc1e 100644 --- a/src/assets/scss/uids.scss +++ b/src/assets/scss/uids.scss @@ -43,7 +43,6 @@ $imgpath: '../../assets/images'; 'menus/internal-navigation/internal-navigation', 'menus/main-menu/main-menu.scss', 'menus/toggle-nav/toggle-nav.scss', -'menus/quick/quick', 'menus/top/top.scss', 'menus/user-menu/user-menu', 'menus/vertical/vertical', diff --git a/src/components/headline/headline.scss b/src/components/headline/headline.scss index 4ff09ac41b..19dbac5560 100644 --- a/src/components/headline/headline.scss +++ b/src/components/headline/headline.scss @@ -99,6 +99,6 @@ h6, .h6 { .bold-headline--highlight.bold-headline--caps, .headline--highlight.headline--uppercase { span { - padding: 0.1rem 1rem 0; + padding: .4rem 1.2rem .8rem; } } diff --git a/src/components/stat/stat.scss b/src/components/stat/stat.scss index b67f1829b2..d845fec45e 100755 --- a/src/components/stat/stat.scss +++ b/src/components/stat/stat.scss @@ -34,14 +34,14 @@ font-weight: bold; font-size: 4rem; border-bottom: 8px solid $primary; - padding: $lg 0 $sm 0; + padding: $lg 0 1rem 0; @include breakpoint(sm) { - padding: $md $lg $sm 0; + padding: $md $lg 1rem 0; } .element--flex-center & { - padding: $md $lg $sm $lg; + padding: $md $lg 1rem $lg; display: block; } @@ -67,10 +67,10 @@ @include breakpoint(sm) { font-size: 5rem; - padding: 0 $lg $sm 0; + padding: 0 $lg 1rem 0; .element--flex-center & { - padding: 0 $lg $sm; + padding: 0 $lg 1rem; } } } @@ -142,15 +142,15 @@ .headline__prefix, .headline__suffix{ font-size: 3.5rem; - vertical-align: middle; + vertical-align: bottom; } .headline__prefix { - margin-right: -15px; + margin-right: -8px; } .headline__suffix{ - margin-left: -15px; + margin-left: -8px; } .stat--horizontal:not(.element--flex-center) { diff --git a/src/components/typography/lists/lists.scss b/src/components/typography/lists/lists.scss index 5b4a1b3e82..1283b94584 100755 --- a/src/components/typography/lists/lists.scss +++ b/src/components/typography/lists/lists.scss @@ -107,7 +107,7 @@ dd { left: -100px; width: 5rem; height: 5rem; - padding-top: 39px; + padding-top: 35px; content: counter(circle-counter); text-align: center; text-transform: uppercase;