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.

Sign up for GitHub

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

add fonts #47

Merged
merged 3 commits into from
Dec 19, 2023
+141 −5
Merged

add fonts #47

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9be01bb
add fonts
kronnox Dec 19, 2023
f0bd9d8
move fallback font definitions to styles.css
kronnox Dec 19, 2023
7a9a001
Merge branch 'main' into issue/46
kronnox Dec 19, 2023
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 added cigaradvisor/fonts/alfaslabone.woff2
View file
Open in desktop
Binary file not shown.
Binary file added cigaradvisor/fonts/montserrat.woff2
View file
Open in desktop
Binary file not shown.
Binary file added cigaradvisor/fonts/opensans.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed cigaradvisor/fonts/roboto-bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed cigaradvisor/fonts/roboto-regular.woff2
View file
Open in desktop
Binary file not shown.
131 changes: 131 additions & 0 deletions cigaradvisor/styles/fonts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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%;
}
14 changes: 9 additions & 5 deletions cigaradvisor/styles/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand All @@ -37,8 +41,8 @@ header {
}

html {
font-size:100%;
line-height:1.5
font-size: 100%;
line-height: 1.5
}

*, ::before, ::after{
Expand All @@ -53,7 +57,7 @@ img {
}

h2 {
font-family: montserrat,sans-serif;
font-family: var(--ff-montserrat);
font-weight: 900;
text-transform: uppercase;
color: #141414;
Expand All @@ -62,7 +66,7 @@ h2 {
}

a{
font-family: montserrat,sans-serif;
font-family: var(--ff-montserrat);
font-weight: 600;
color: #141414;
font-size: 12px;
Expand Down Expand Up @@ -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;
}
Expand Down