ben.carrasco/next-static-site
1
0
Fork 0
mirror of https://github.com/jambonz/next-static-site.git synced 2025-12-19 04:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move font-family names into SASS variables

Browse Source
This commit is contained in:
kitajchuk
2021-06-17 18:40:20 -07:00
parent 6a54e2088c
commit bce68f5e4d
7 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
styles/_buttons.scss
View File

@@ -19,7 +19,7 @@
// }
&--login {
font-family: 'objectivitymedium';
font-family: $font-medium;
font-size: $ms-size;
background-color: transparent;
border: 2px solid $jambonz;
@@ -60,7 +60,7 @@
}
&--pill {
font-family: 'objectivityregular';
font-family: $font-regular;
background-color: transparent;
border: 2px solid $charcoal;
color: $charcoal;

12
styles/_fonts.scss
View File

@@ -1,12 +1,12 @@
@font-face {
font-family: 'objectivityregular';
font-family: $font-regular;
src: url('/fonts/objectivity-regular-webfont.woff2') format('woff2'),
url('/fonts/objectivity-regular-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'objectivityregular_slanted';
font-family: $font-regular-italic;
src: url('/fonts/objectivity-regularslanted-webfont.woff2') format('woff2'),
url('/fonts/objectivity-regularslanted-webfont.woff') format('woff');
font-weight: normal;
@@ -14,14 +14,14 @@
}
@font-face {
font-family: 'objectivitymedium';
font-family: $font-medium;
src: url('/fonts/objectivity-medium-webfont.woff2') format('woff2'),
url('/fonts/objectivity-medium-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'objectivitymedium_slanted';
font-family: $font-medium-italic;
src: url('/fonts/objectivity-mediumslanted-webfont.woff2') format('woff2'),
url('/fonts/objectivity-mediumslanted-webfont.woff') format('woff');
font-weight: normal;
@@ -29,14 +29,14 @@
}
@font-face {
font-family: 'objectivitybold';
font-family: $font-bold;
src: url('/fonts/objectivity-bold-webfont.woff2') format('woff2'),
url('/fonts/objectivity-bold-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'objectivitybold_slanted';
font-family: $font-bold-italic;
src: url('/fonts/objectivity-boldslanted-webfont.woff2') format('woff2'),
url('/fonts/objectivity-boldslanted-webfont.woff') format('woff');
font-weight: normal;

8
styles/_mixins.scss
View File

@@ -2,19 +2,19 @@
* Mixins
*******************************************************************************/
@mixin font-bold() {
font-family: 'objectivitybold';
font-family: $font-bold;
font-weight: normal;
em {
font-family: 'objectivitybold_slanted';
font-family: $font-bold-italic;
}
}
@mixin font-medium() {
font-family: 'objectivitymedium';
font-family: $font-medium;
em {
font-family: 'objectivitymedium_slanted';
font-family: $font-medium-italic;
}
}

6
styles/_navi.scss
View File

@@ -23,7 +23,7 @@
&__links {
transform: translateY(-4px);
font-family: 'objectivitymedium';
font-family: $font-medium;
}
&__link {
@@ -105,7 +105,7 @@
.navi__link {
color: $white;
font-size: $h6-size;
font-family: 'objectivitymedium';
font-family: $font-medium;
margin: 0;
}
}
@@ -115,7 +115,7 @@
.navi__link {
font-size: $m-size;
font-family: 'objectivityregular';
font-family: $font-regular;
}
}

2
styles/_text-layout.scss
View File

@@ -23,7 +23,7 @@ $font-mono: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
}
> blockquote > p {
font-family: 'objectivityregular_slanted';
font-family: $font-regular-italic;
border-left: inset;
padding-left: 10px;
}

4
styles/_typography.scss
View File

@@ -1,6 +1,6 @@
html,
body {
font-family: 'objectivityregular';
font-family: $font-regular;
letter-spacing: -0.02px;
color: $charcoal;
}
@@ -64,7 +64,7 @@ strong {
}
em {
font-family: 'objectivityregular_slanted';
font-family: $font-regular-italic;
}
.h1, h1 {

10
styles/_vars.scss
View File

@@ -14,6 +14,16 @@ $blue: #006dff;
$green: #008a1a;
$red: #e10e22;
/******************************************************************************
* Font family
*******************************************************************************/
$font-regular: 'objectivityregular';
$font-regular-italic: 'objectivityregular_slanted';
$font-medium: 'objectivitymedium';
$font-medium-italic: 'objectivitymedium_slanted';
$font-bold: 'objectivitybold';
$font-bold-italic: 'objectivitybold_slanted';
/******************************************************************************
* Font sizes
*******************************************************************************/