rayelliott
/
victor-hugo
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: rayelliott:b7b4ab13b098c8967d5807d85821ed0433d44952
Branches Tags
rayelliott:master
...
compare: rayelliott:a52470e8b8f29c2cc1052bb538f3496865ebbb18
Branches Tags
rayelliott:master

2 Commits
b7b4ab13b0 ... a52470e8b8

Author SHA1 Message Date
Ray Elliott a52470e8b8 check for valid font-weights in typography mixins 2020-04-22 19:08:58 +00:00
Ray Elliott 27a87af44f move typography mixins into typography.scss 2020-04-22 18:05:25 +00:00
4 changed files with 26 additions and 16 deletions
Show Stats Expand all files Collapse all files

2
site/layouts/_default/baseof.html
View File

@ -11,7 +11,7 @@
{{ with $stylesheet.css }} {{ with $stylesheet.css }}
<link href="{{ relURL . }}" rel="stylesheet"> <link href="{{ relURL . }}" rel="stylesheet">
{{ end }} {{ end }}
<link href="https://fonts.googleapis.com/css?family=Montserrat&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;600&display=swap" rel="stylesheet">
</head> </head>
<body> <body>

15
src/css/imports/mixins.scss
View File

@ -1,18 +1,3 @@
@mixin font-body($weight: normal) {
font-family: "Montserrat", sans-serif;
font-weight: $weight;
}
@mixin font-title($weight: normal) {
font-family: "Montserrat", sans-serif;
font-weight: $weight;
}
@mixin font-link($weight: normal) {
font-family: "Montserrat", sans-serif;
font-weight: $weight;
}
@mixin abs-full { @mixin abs-full {
position: absolute; position: absolute;
width: 100%; width: 100%;

22
src/css/imports/typography.scss Normal file
View File

@ -0,0 +1,22 @@
@mixin font-1($weight) {
font-family: "Montserrat", sans-serif;
@if $weight == regular {
font-weight: 400;
} @else if $weight == bold {
font-weight: 600;
} @else {
@error "font-weight #{$weight} not in valid font-weights for font-1: 'Montserrat'.";
}
}
@mixin font-body($weight: regular) {
@include font-1($weight);
}
@mixin font-title($weight: regular) {
@include font-1($weight);
}
@mixin font-link($weight: regular) {
@include font-1($weight);
}

3
src/css/main.css
View File

@ -5,8 +5,11 @@
@import "milligram/src/milligram.scss"; @import "milligram/src/milligram.scss";
@import "imports/mixins.scss"; @import "imports/mixins.scss";
@import "imports/typography.scss";
@import "imports/base.scss"; @import "imports/base.scss";
@import "imports/layout.scss"; @import "imports/layout.scss";
@import "imports/utility.scss"; @import "imports/utility.scss";
@import "imports/header.scss"; @import "imports/header.scss";