Skip to content

GitLab

G
GSC Material UI
Commit abbf1fbe authored by Ben Galloway's avatar Ben Galloway
Browse files
Options

Sort font definitions for Proxima Nova bold

parent 8ab12f4c
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 27 deletions
ProximaNovaFontFace.css
View file @ abbf1fbe
@font-face { @font-face {
font-family: "ProximaNova"; font-family: "ProximaNova";
font-style: normal; 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");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Light.eot?#iefix") format("embedded-opentype"), 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"), url("https://style.gsc.org.uk/fonts/ProximaNova-Light.woff2") format("woff2"),
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
@font-face { @font-face {
font-family: "ProximaNova"; font-family: "ProximaNova";
font-style: normal; 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");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.eot?#iefix") format("embedded-opentype"), 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"), url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.woff2") format("woff2"),
...@@ -22,10 +22,21 @@ ...@@ -22,10 +22,21 @@
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.svg#ProximaNova-Semibold") format("svg"); 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-face {
font-family: "ProximaNova"; font-family: "ProximaNova";
font-style: italic; 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");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.eot?#iefix") format("embedded-opentype"), 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"), url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.woff2") format("woff2"),
...@@ -37,7 +48,7 @@ ...@@ -37,7 +48,7 @@
@font-face { @font-face {
font-family: "ProximaNova"; font-family: "ProximaNova";
font-style: italic; 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");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.eot?#iefix") format("embedded-opentype"), 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"), url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.woff2") format("woff2"),
......
package.json
View file @ abbf1fbe
{ {
"name": "@gsc/material", "name": "@gsc/material",
"version": "2.2.1", "version": "2.3.0",
"description": "An implementation of Material-UI with GSC styling", "description": "An implementation of Material-UI with GSC styling",
"main": "index.js", "main": "index.js",
"repository": "https://gitlab.gsc.org.uk/gsc-frameworks/gsc-material.git", "repository": "https://gitlab.gsc.org.uk/gsc-frameworks/gsc-material.git",
......
src/ProximaNovaFontFace.css
View file @ abbf1fbe
@font-face { @font-face {
font-family: "ProximaNova"; font-family: "ProximaNova";
font-style: normal; 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");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Light.eot?#iefix") format("embedded-opentype"), 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"), url("https://style.gsc.org.uk/fonts/ProximaNova-Light.woff2") format("woff2"),
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
@font-face { @font-face {
font-family: "ProximaNova"; font-family: "ProximaNova";
font-style: normal; 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");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.eot?#iefix") format("embedded-opentype"), 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"), url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.woff2") format("woff2"),
...@@ -22,10 +22,21 @@ ...@@ -22,10 +22,21 @@
url("https://style.gsc.org.uk/fonts/ProximaNova-Semibold.svg#ProximaNova-Semibold") format("svg"); 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-face {
font-family: "ProximaNova"; font-family: "ProximaNova";
font-style: italic; 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");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.eot?#iefix") format("embedded-opentype"), 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"), url("https://style.gsc.org.uk/fonts/ProximaNova-LightIt.woff2") format("woff2"),
...@@ -37,7 +48,7 @@ ...@@ -37,7 +48,7 @@
@font-face { @font-face {
font-family: "ProximaNova"; font-family: "ProximaNova";
font-style: italic; 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");
src: url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.eot?#iefix") format("embedded-opentype"), 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"), url("https://style.gsc.org.uk/fonts/ProximaNova-SemiboldIt.woff2") format("woff2"),
......
src/themeDefinition.js
View file @ abbf1fbe
...@@ -48,27 +48,21 @@ const GSCTheme = { ...@@ -48,27 +48,21 @@ const GSCTheme = {
].join(","), ].join(","),
h1: { h1: {
fontFamily: "ProximaNova", fontFamily: "ProximaNova",
fontWeight: 600,
}, },
h2: { h2: {
fontFamily: "ProximaNova", fontFamily: "ProximaNova",
fontWeight: 600,
}, },
h3: { h3: {
fontFamily: "ProximaNova", fontFamily: "ProximaNova",
fontWeight: 600,
}, },
h4: { h4: {
fontFamily: "ProximaNova", fontFamily: "ProximaNova",
fontWeight: 600,
}, },
h5: { h5: {
fontFamily: "ProximaNova", fontFamily: "ProximaNova",
fontWeight: 600,
}, },
h6: { h6: {
fontFamily: "ProximaNova", fontFamily: "ProximaNova",
fontWeight: 600,
}, },
button: { button: {
textTransform: "none", textTransform: "none",
......
themeDefinition.js
View file @ abbf1fbe
...@@ -43,28 +43,22 @@ var GSCTheme = { ...@@ -43,28 +43,22 @@ var GSCTheme = {
typography: { typography: {
fontFamily: ['"Helvetica Neue"', "Arial", "sans-serif", "-apple-system", "BlinkMacSystemFont", '"Segoe UI"', '"Apple Color Emoji"', '"Segoe UI Emoji"', '"Segoe UI Symbol"'].join(","), fontFamily: ['"Helvetica Neue"', "Arial", "sans-serif", "-apple-system", "BlinkMacSystemFont", '"Segoe UI"', '"Apple Color Emoji"', '"Segoe UI Emoji"', '"Segoe UI Symbol"'].join(","),
h1: { h1: {
fontFamily: "ProximaNova", fontFamily: "ProximaNova"
fontWeight: 600
}, },
h2: { h2: {
fontFamily: "ProximaNova", fontFamily: "ProximaNova"
fontWeight: 600
}, },
h3: { h3: {
fontFamily: "ProximaNova", fontFamily: "ProximaNova"
fontWeight: 600
}, },
h4: { h4: {
fontFamily: "ProximaNova", fontFamily: "ProximaNova"
fontWeight: 600
}, },
h5: { h5: {
fontFamily: "ProximaNova", fontFamily: "ProximaNova"
fontWeight: 600
}, },
h6: { h6: {
fontFamily: "ProximaNova", fontFamily: "ProximaNova"
fontWeight: 600
}, },
button: { button: {
textTransform: "none" 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