diff --git a/cigaradvisor/fonts/alfaslabone.woff2 b/cigaradvisor/fonts/alfaslabone.woff2 new file mode 100644 index 00000000..1440a146 Binary files /dev/null and b/cigaradvisor/fonts/alfaslabone.woff2 differ diff --git a/cigaradvisor/fonts/montserrat.woff2 b/cigaradvisor/fonts/montserrat.woff2 new file mode 100644 index 00000000..e9bd2e87 Binary files /dev/null and b/cigaradvisor/fonts/montserrat.woff2 differ diff --git a/cigaradvisor/fonts/opensans.woff2 b/cigaradvisor/fonts/opensans.woff2 new file mode 100644 index 00000000..545243f0 Binary files /dev/null and b/cigaradvisor/fonts/opensans.woff2 differ diff --git a/cigaradvisor/fonts/roboto-bold.woff2 b/cigaradvisor/fonts/roboto-bold.woff2 deleted file mode 100644 index 4aeda71b..00000000 Binary files a/cigaradvisor/fonts/roboto-bold.woff2 and /dev/null differ diff --git a/cigaradvisor/fonts/roboto-regular.woff2 b/cigaradvisor/fonts/roboto-regular.woff2 deleted file mode 100644 index b65a361a..00000000 Binary files a/cigaradvisor/fonts/roboto-regular.woff2 and /dev/null differ diff --git a/cigaradvisor/styles/fonts.css b/cigaradvisor/styles/fonts.css index 53b3d4f7..062661c5 100644 --- a/cigaradvisor/styles/fonts.css +++ b/cigaradvisor/styles/fonts.css @@ -1 +1,132 @@ /* Add font definitions here. */ + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-display: swap; + src: url('../fonts/opensans.woff2') format('woff2'); +} + +@font-face { + font-family: 'Open Sans Fallback'; + font-style: normal; + font-weight: 400; + src: local('Arial'); + ascent-override: 101.58%; + descent-override: 27.84%; + line-gap-override: 0.00%; + size-adjust: 105.22%; +} + +@font-face { + font-family: 'Open Sans Fallback'; + font-style: normal; + font-weight: 600; + src: local('Arial Bold'); + ascent-override: 109.90%; + descent-override: 30.12%; + line-gap-override: 0.00%; + size-adjust: 97.26%; +} + +@font-face { + font-family: 'Open Sans Fallback'; + font-style: normal; + font-weight: 700; + src: local('Arial Bold'); + ascent-override: 109.90%; + descent-override: 30.12%; + line-gap-override: 0.00%; + size-adjust: 97.26%; +} + +@font-face { + font-family: 'Open Sans Fallback'; + font-style: normal; + font-weight: 900; + src: local('Arial Bold'); + ascent-override: 109.90%; + descent-override: 30.12%; + line-gap-override: 0.00%; + size-adjust: 97.26%; +} + +@font-face { + font-family: Montserrat; + font-style: normal; + font-display: swap; + src: url('../fonts/montserrat.woff2') format('woff2'); +} + +@font-face { + font-family: 'Montserrat Fallback'; + font-style: normal; + font-weight: 400; + src: local('Arial'); + ascent-override: 87.81%; + descent-override: 22.77%; + line-gap-override: 0.00%; + size-adjust: 110.23%; +} + +@font-face { + font-family: 'Montserrat Fallback'; + font-style: normal; + font-weight: 600; + src: local('Arial Bold'); + ascent-override: 95.01%; + descent-override: 24.63%; + line-gap-override: 0.00%; + size-adjust: 101.89%; +} + +@font-face { + font-family: 'Montserrat Fallback'; + font-style: normal; + font-weight: 700; + src: local('Arial Bold'); + ascent-override: 95.01%; + descent-override: 24.63%; + line-gap-override: 0.00%; + size-adjust: 101.89%; +} + +@font-face { + font-family: 'Montserrat Fallback'; + font-style: normal; + font-weight: 900; + src: local('Arial Bold'); + ascent-override: 95.01%; + descent-override: 24.63%; + line-gap-override: 0.00%; + size-adjust: 101.89%; +} + +@font-face { + font-family: 'Alfa Slab One'; + font-style: normal; + font-display: swap; + src: url('../fonts/alfaslabone.woff2') format('woff2'); +} + +@font-face { + font-family: 'Alfa Slab One Fallback'; + font-style: normal; + font-weight: 400; + src: local('Arial'); + ascent-override: 85.41%; + descent-override: 27.45%; + line-gap-override: 0.00%; + size-adjust: 121.30%; +} + +@font-face { + font-family: 'Alfa Slab One Fallback'; + font-style: normal; + font-weight: 900; + src: local('Arial Bold'); + ascent-override: 92.40%; + descent-override: 29.70%; + line-gap-override: 0.00%; + size-adjust: 112.12%; +} diff --git a/cigaradvisor/styles/styles.css b/cigaradvisor/styles/styles.css index 3286a29d..07bfbdff 100644 --- a/cigaradvisor/styles/styles.css +++ b/cigaradvisor/styles/styles.css @@ -14,6 +14,10 @@ /* colors */ /* fonts */ + --ff-arial: 'Arial', sans-serif; + --ff-opensans: 'Open Sans', 'Open Sans Fallback', sans-serif; + --ff-montserrat: 'Montserrat', 'Montserrat Fallback', sans-serif; + --ff-alfaslabone: 'Alfa Slab One', 'Alfa Slab One Fallback', cursive; /* body sizes */ @@ -37,8 +41,8 @@ header { } html { - font-size:100%; - line-height:1.5 + font-size: 100%; + line-height: 1.5 } *, ::before, ::after{ @@ -53,7 +57,7 @@ img { } h2 { - font-family: montserrat,sans-serif; + font-family: var(--ff-montserrat); font-weight: 900; text-transform: uppercase; color: #141414; @@ -62,7 +66,7 @@ h2 { } a{ - font-family: montserrat,sans-serif; + font-family: var(--ff-montserrat); font-weight: 600; color: #141414; font-size: 12px; @@ -104,7 +108,7 @@ main .section[data-layout="50/50"] > div { flex-basis: 100%; flex-direction: column; } - + main .section[data-layout="50/50"] .left-grid > div{ padding: 10px; }