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

Jump to bottom

Troca da fonte Roboto pela fonte Inter #322

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Troca da fonte Roboto pela fonte Inter #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e82d2db
Troca da fonte Roboto pela fonte Inter
geueds Jun 13, 2020
8f9196d
Create inter.css
geueds Jun 30, 2020
e074ab3
Importações da fonte Inter e nos CSS
geueds Jun 30, 2020
0758d6e
Merge branch 'develop' into patch-1
geueds Jul 1, 2020
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
18 changes: 9 additions & 9 deletions static/css/application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
@import url('https://brasil.io/static/css/inter/inter.css');
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opa, acho que aqui a URL poderia ser relativa ao endereço do CSS, não?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No caso, um /inter/inter.css apenas?

html { font-family: 'Inter', sans-serif; }
@supports (font-variation-settings: normal) {
html { font-family: 'Inter var', sans-serif; }
}

html {
height: 100%;
box-sizing: border-box;
Expand All @@ -13,14 +19,8 @@ body {
position: relative;
margin: 0;
min-height: 100%;
font-family: Roboto, sans-serif;
font-weight: 300;
flex-direction: column;
display: flex;
}

main {
flex: 1 0 auto;
font-family: 'Inter var', sans-serif;
font-weight: 400;
}

.divider-new:before {
Expand Down Expand Up @@ -75,7 +75,7 @@ main {

.card .card-title {
font-size: 1.5em;
font-weight: 300;
font-weight: 700;
}

.card .card-content.card-body {
Expand Down
Binary file added static/css/inter/font-files/Inter-italic.var.woff2
View file
Open in desktop
Binary file not shown.
Binary file added static/css/inter/font-files/Inter-roman.var.woff2
View file
Open in desktop
Binary file not shown.
25 changes: 25 additions & 0 deletions static/css/inter/inter.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/* -------------------------------------------------------
Variable font.
Usage:

html { font-family: 'Inter', sans-serif; }
@supports (font-variation-settings: normal) {
html { font-family: 'Inter var', sans-serif; }
}
*/
@font-face {
font-family: 'Inter var';
font-weight: 100 900;
font-style: normal;
font-named-instance: 'Regular';
font-display: swap;
src: url("font-files/Inter-roman.var.woff2") format("woff2");
}
@font-face {
font-family: 'Inter var';
font-weight: 100 900;
font-style: italic;
font-named-instance: 'Italic';
font-display: swap;
src: url("font-files/Inter-italic.var.woff2") format("woff2");
}
2 changes: 1 addition & 1 deletion static/css/materialize.min.css
View file
Open in desktop

Large diffs are not rendered by default.