| Index: static/scss/base/_font.scss |
| =================================================================== |
| --- a/static/scss/base/_font.scss |
| +++ b/static/scss/base/_font.scss |
| @@ -16,45 +16,44 @@ |
| @font-face |
| { |
| font-family: "Source Sans Pro"; |
| font-weight: 300; |
| font-style: normal; |
| src: url("../fonts/Source-Sans-Pro-300/Source-Sans-Pro-300.eot"); |
| src: url("../fonts/Source-Sans-Pro-300/Source-Sans-Pro-300.eot?#iefix") format("embedded-opentype"), |
| - local("Source Sans Pro Light"), |
| - local("Source-Sans-Pro-300"), |
| - url("../fonts/Source-Sans-Pro-300/Source-Sans-Pro-300.woff2") format("woff2"), |
| - url("../fonts/Source-Sans-Pro-300/Source-Sans-Pro-300.woff") format("woff"), |
| - url("../fonts/Source-Sans-Pro-300/Source-Sans-Pro-300.ttf") format("truetype"), |
| - url("../fonts/Source-Sans-Pro-300/Source-Sans-Pro-300.svg#SourceSansPro") format("svg"); |
| + local("Source Sans Pro Light"), |
|
juliandoucette
2017/10/24 09:56:08
NIT: Are these spaces tabs?
ire
2017/10/24 14:43:56
Nope, they are spaces
|
| + local("Source-Sans-Pro-300"), |
| + url("../fonts/Source-Sans-Pro-300/Source-Sans-Pro-300.woff2") format("woff2"), |
| + url("../fonts/Source-Sans-Pro-300/Source-Sans-Pro-300.woff") format("woff"), |
|
juliandoucette
2017/10/24 09:56:08
NIT: Are we using 300 anywhere?
ire
2017/10/24 14:43:56
Doesn't look like we are. Removed it too
|
| + url("../fonts/Source-Sans-Pro-300/Source-Sans-Pro-300.ttf") format("truetype"), |
| + url("../fonts/Source-Sans-Pro-300/Source-Sans-Pro-300.svg#SourceSansPro") format("svg"); |
| } |
| @font-face |
| { |
| font-family: "Source Sans Pro"; |
| font-weight: 400; |
| font-style: normal; |
| src: url("../fonts/Source-Sans-Pro-400/Source-Sans-Pro-400.eot"); |
| src: url("../fonts/Source-Sans-Pro-400/Source-Sans-Pro-400.eot?#iefix") format("embedded-opentype"), |
| - local("Source Sans Pro"), |
| - local("Source-Sans-Pro-400"), |
| - url("../fonts/Source-Sans-Pro-400/Source-Sans-Pro-400.woff2") format("woff2"), |
| - url("../fonts/Source-Sans-Pro-400/Source-Sans-Pro-400.woff") format("woff"), |
| - url("../fonts/Source-Sans-Pro-400/Source-Sans-Pro-400.ttf") format("truetype"), |
| - url("../fonts/Source-Sans-Pro-400/Source-Sans-Pro-400.svg#SourceSansPro") format("svg"); |
| + local("Source Sans Pro"), |
| + local("Source-Sans-Pro-400"), |
| + url("../fonts/Source-Sans-Pro-400/Source-Sans-Pro-400.woff2") format("woff2"), |
| + url("../fonts/Source-Sans-Pro-400/Source-Sans-Pro-400.woff") format("woff"), |
| + url("../fonts/Source-Sans-Pro-400/Source-Sans-Pro-400.ttf") format("truetype"), |
| + url("../fonts/Source-Sans-Pro-400/Source-Sans-Pro-400.svg#SourceSansPro") format("svg"); |
| } |
| @font-face |
| { |
| font-family: "Source Sans Pro"; |
| - font-weight: 700; |
| + font-weight: 600; |
| font-style: normal; |
|
juliandoucette
2017/10/24 09:56:08
NIT: You could name this "bold"
Ack: That may be m
ire
2017/10/24 14:43:56
Do you mean the "font-style"? That's to do with it
|
| - src: url("../fonts/Source-Sans-Pro-700/Source-Sans-Pro-700.eot"); |
| - src: url("../fonts/Source-Sans-Pro-700/Source-Sans-Pro-700.eot?#iefix") format("embedded-opentype"), |
| - local("Source Sans Pro Bold"), |
| - local("Source-Sans-Pro-700"), |
| - url("../fonts/Source-Sans-Pro-700/Source-Sans-Pro-700.woff2") format("woff2"), |
| - url("../fonts/Source-Sans-Pro-700/Source-Sans-Pro-700.woff") format("woff"), |
| - url("../fonts/Source-Sans-Pro-700/Source-Sans-Pro-700.ttf") format("truetype"), |
| - url("../fonts/Source-Sans-Pro-700/Source-Sans-Pro-700.svg#SourceSansPro") format("svg"); |
| -} |
| + src: url("../fonts/Source-Sans-Pro-600/Source-Sans-Pro-600.eot"); |
| + src: url("../fonts/Source-Sans-Pro-600/Source-Sans-Pro-600.eot?#iefix") format("embedded-opentype"), |
| + local("Source Sans Pro Semibold"), |
| + local("Source-Sans-Pro-600"), |
| + url("../fonts/Source-Sans-Pro-600/Source-Sans-Pro-600.woff2") format("woff2"), |
| + url("../fonts/Source-Sans-Pro-600/Source-Sans-Pro-600.woff") format("woff"), |
| + url("../fonts/Source-Sans-Pro-600/Source-Sans-Pro-600.ttf") format("truetype"); |
| +} |