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.

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

Feature add updated antonio local font #828

Open
wants to merge 9 commits into
base: 3.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file removed src/assets/fonts/Antonio-Bold.woff
Binary file not shown.
Binary file removed src/assets/fonts/Antonio-Bold.woff2
Binary file not shown.
Binary file removed src/assets/fonts/Antonio-Light.woff
Binary file not shown.
Binary file removed src/assets/fonts/Antonio-Light.woff2
Binary file not shown.
Binary file removed src/assets/fonts/Antonio-Regular.woff
Binary file not shown.
Binary file removed src/assets/fonts/Antonio-Regular.woff2
Binary file not shown.
Binary file removed src/assets/fonts/antonio-bold.woff
Binary file not shown.
Binary file removed src/assets/fonts/antonio-bold.woff2
Binary file not shown.
Binary file removed src/assets/fonts/antonio-light.woff
Binary file not shown.
Binary file removed src/assets/fonts/antonio-light.woff2
Binary file not shown.
Binary file removed src/assets/fonts/antonio-regular.woff
Binary file not shown.
Binary file removed src/assets/fonts/antonio-regular.woff2
Binary file not shown.
Binary file added src/assets/fonts/antonio-v11-bold.ttf
Binary file not shown.
Binary file added src/assets/fonts/antonio-v11-bold.woff
Binary file not shown.
Binary file added src/assets/fonts/antonio-v11-bold.woff2
Binary file not shown.
Binary file added src/assets/fonts/antonio-v11-light.ttf
Binary file not shown.
Binary file added src/assets/fonts/antonio-v11-light.woff
Binary file not shown.
Binary file added src/assets/fonts/antonio-v11-light.woff2
Binary file not shown.
Binary file added src/assets/fonts/antonio-v11-regular.ttf
Binary file not shown.
Binary file added src/assets/fonts/antonio-v11-regular.woff
Binary file not shown.
Binary file added src/assets/fonts/antonio-v11-regular.woff2
Binary file not shown.
35 changes: 26 additions & 9 deletions src/assets/scss/_local-fonts.scss
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down Expand Up @@ -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");
}
2 changes: 1 addition & 1 deletion src/assets/scss/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/assets/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
1 change: 0 additions & 1 deletion src/assets/scss/uids.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/components/headline/headline.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
16 changes: 8 additions & 8 deletions src/components/stat/stat.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}
}
}
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/typography/lists/lists.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down