Commit abbf1fbe authored by Ben Galloway's avatar Ben Galloway

Sort font definitions for Proxima Nova bold

parent 8ab12f4c
@font-face {
font-family: "ProximaNova";
font-style: normal;
font-weight: 300;
font-weight: 100;
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Light.eot");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Light.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/ProximaNova-Light.woff2") format("woff2"),
......@@ -13,7 +13,7 @@
@font-face {
font-family: "ProximaNova";
font-style: normal;
font-weight: 600;
font-weight: 200;
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.eot");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.woff2") format("woff2"),
......@@ -22,10 +22,21 @@
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.svg#ProximaNova-Semibold") format("svg");
}
@font-face {
font-family: "ProximaNova";
font-style: normal;
font-weight: 400;
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.eot");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.woff") format("woff"),
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.ttf") format("truetype"),
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.svg#ProximaNova-Bold") format("svg");
}
@font-face {
font-family: "ProximaNova";
font-style: italic;
font-weight: 300;
font-weight: 100;
src: url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.eot");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.woff2") format("woff2"),
......@@ -37,7 +48,7 @@
@font-face {
font-family: "ProximaNova";
font-style: italic;
font-weight: 600;
font-weight: 200;
src: url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.eot");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.woff2") format("woff2"),
......
{
"name": "@gsc/material",
"version": "2.2.1",
"version": "2.3.0",
"description": "An implementation of Material-UI with GSC styling",
"main": "index.js",
"repository": "https://gitlab.gsc.org.uk/gsc-frameworks/gsc-material.git",
......
@font-face {
font-family: "ProximaNova";
font-style: normal;
font-weight: 300;
font-weight: 100;
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Light.eot");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Light.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/ProximaNova-Light.woff2") format("woff2"),
......@@ -13,7 +13,7 @@
@font-face {
font-family: "ProximaNova";
font-style: normal;
font-weight: 600;
font-weight: 200;
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.eot");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.woff2") format("woff2"),
......@@ -22,10 +22,21 @@
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.svg#ProximaNova-Semibold") format("svg");
}
@font-face {
font-family: "ProximaNova";
font-style: normal;
font-weight: 400;
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.eot");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.woff") format("woff"),
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.ttf") format("truetype"),
url("https://style.gsc.org.uk/fonts/ProximaNova-Bold.svg#ProximaNova-Bold") format("svg");
}
@font-face {
font-family: "ProximaNova";
font-style: italic;
font-weight: 300;
font-weight: 100;
src: url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.eot");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.woff2") format("woff2"),
......@@ -37,7 +48,7 @@
@font-face {
font-family: "ProximaNova";
font-style: italic;
font-weight: 600;
font-weight: 200;
src: url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.eot");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.woff2") format("woff2"),
......
......@@ -48,27 +48,21 @@ const GSCTheme = {
].join(","),
h1: {
fontFamily: "ProximaNova",
fontWeight: 600,
},
h2: {
fontFamily: "ProximaNova",
fontWeight: 600,
},
h3: {
fontFamily: "ProximaNova",
fontWeight: 600,
},
h4: {
fontFamily: "ProximaNova",
fontWeight: 600,
},
h5: {
fontFamily: "ProximaNova",
fontWeight: 600,
},
h6: {
fontFamily: "ProximaNova",
fontWeight: 600,
},
button: {
textTransform: "none",
......
......@@ -43,28 +43,22 @@ var GSCTheme = {
typography: {
fontFamily: ['"Helvetica Neue"', "Arial", "sans-serif", "-apple-system", "BlinkMacSystemFont", '"Segoe UI"', '"Apple Color Emoji"', '"Segoe UI Emoji"', '"Segoe UI Symbol"'].join(","),
h1: {
fontFamily: "ProximaNova",
fontWeight: 600
fontFamily: "ProximaNova"
},
h2: {
fontFamily: "ProximaNova",
fontWeight: 600
fontFamily: "ProximaNova"
},
h3: {
fontFamily: "ProximaNova",
fontWeight: 600
fontFamily: "ProximaNova"
},
h4: {
fontFamily: "ProximaNova",
fontWeight: 600
fontFamily: "ProximaNova"
},
h5: {
fontFamily: "ProximaNova",
fontWeight: 600
fontFamily: "ProximaNova"
},
h6: {
fontFamily: "ProximaNova",
fontWeight: 600
fontFamily: "ProximaNova"
},
button: {
textTransform: "none"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment