Skip to content

GitLab

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

New version build

parent 46d821b7
Show whitespace changes
Inline Side-by-side
Showing with 157 additions and 73 deletions
ArialFontFace.css 0 → 100644
View file @ a8537b8e
@font-face {
font-family: "Arial";
src: url("https://style.gsc.org.uk/fonts/Arial/Arial-BoldItalicMT.eot");
src: local("Arial Bold Italic"), local("Arial-BoldItalicMT"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-BoldItalicMT.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-BoldItalicMT.woff2") format("woff2"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-BoldItalicMT.woff") format("woff"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-BoldItalicMT.ttf") format("truetype"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-BoldItalicMT.svg#Arial-BoldItalicMT") format("svg");
font-weight: bold;
font-style: italic;
}
@font-face {
font-family: "Arial";
src: url("https://style.gsc.org.uk/fonts/Arial/ArialMT.eot");
src: local("Arial"), local("ArialMT"),
url("https://style.gsc.org.uk/fonts/Arial/ArialMT.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/Arial/ArialMT.woff2") format("woff2"),
url("https://style.gsc.org.uk/fonts/Arial/ArialMT.woff") format("woff"),
url("https://style.gsc.org.uk/fonts/Arial/ArialMT.ttf") format("truetype"),
url("https://style.gsc.org.uk/fonts/Arial/ArialMT.svg#ArialMT") format("svg");
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: "Arial";
src: url("https://style.gsc.org.uk/fonts/Arial/Arial-BoldMT.eot");
src: local("Arial Bold"), local("Arial-BoldMT"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-BoldMT.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-BoldMT.woff2") format("woff2"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-BoldMT.woff") format("woff"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-BoldMT.ttf") format("truetype"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-BoldMT.svg#Arial-BoldMT") format("svg");
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: "Arial";
src: url("https://style.gsc.org.uk/fonts/Arial/Arial-ItalicMT.eot");
src: local("Arial Italic"), local("Arial-ItalicMT"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-ItalicMT.eot?#iefix") format("embedded-opentype"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-ItalicMT.woff2") format("woff2"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-ItalicMT.woff") format("woff"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-ItalicMT.ttf") format("truetype"),
url("https://style.gsc.org.uk/fonts/Arial/Arial-ItalicMT.svg#Arial-ItalicMT") format("svg");
font-weight: normal;
font-style: italic;
}
index.js
View file @ a8537b8e
...@@ -11,80 +11,17 @@ var _styles = require("@material-ui/core/styles"); ...@@ -11,80 +11,17 @@ var _styles = require("@material-ui/core/styles");
var _core = require("@material-ui/core"); var _core = require("@material-ui/core");
var _themeDefinition = _interopRequireDefault(require("./themeDefinition"));
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var GSCTheme = (0, _styles.responsiveFontSizes)((0, _styles.createMuiTheme)({ var GSCTheme = (0, _styles.responsiveFontSizes)((0, _styles.createMuiTheme)(_themeDefinition.default));
gsc: {
// Core
navy: "#2e2d44",
teal: "#30b7bb",
offwhite: "#f1f4f5",
// Secondary
pink: "#e12a58",
gold: "#e5b94c",
// Tertiary
darkteal: "#036173",
blue: "#36a9e1",
lime: "#d5db40",
orange: "#e56a0c",
red: "#e40426",
purple: "#64335f",
green: "#22b573",
white: "#ffffff"
},
palette: {
primary: {
main: "#2e2d44",
contrastText: "#f1f4f5"
},
secondary: {
main: "#30b7bb",
contrastText: "#2e2d44"
},
error: {
main: "#e40426"
},
background: {
default: "#f1f4f5",
paper: "#ffffff"
}
},
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
},
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"
}
}
}));
var GSCMaterial = function GSCMaterial(props) { var GSCMaterial = function GSCMaterial(_ref) {
var children = _ref.children;
return _react.default.createElement(_styles.MuiThemeProvider, { return _react.default.createElement(_styles.MuiThemeProvider, {
theme: GSCTheme theme: GSCTheme
}, _react.default.createElement(_core.CssBaseline, null), props.children); }, _react.default.createElement(_core.CssBaseline, null), children);
}; };
var _default = GSCMaterial; var _default = GSCMaterial;
......
package.json
View file @ a8537b8e
{ {
"name": "@gsc/material", "name": "@gsc/material",
"version": "2.0.1", "version": "2.2.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",
...@@ -9,10 +9,14 @@ ...@@ -9,10 +9,14 @@
"private": true, "private": true,
"files": [ "files": [
"index.js", "index.js",
"ProximaNovaFontFace.css" "theme.js",
"themeDefinition.js",
"ProximaNovaFontFace.css",
"ArialFontFace.css"
], ],
"peerDependencies": { "optionalDependencies": {
"@material-ui/core": "^4.1.0" "@material-ui/core": "^4.4.0",
"@material-ui/styles": "^4.3.3"
}, },
"devDependencies": { "devDependencies": {
"@babel/cli": "^7.1.2", "@babel/cli": "^7.1.2",
......
theme.js 0 → 100644
View file @ a8537b8e
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.default = void 0;
var _styles = require("@material-ui/styles");
var _themeDefinition = _interopRequireDefault(require("./themeDefinition"));
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var GSCTheme = (0, _styles.responsiveFontSizes)((0, _styles.createMuiTheme)(_themeDefinition.default));
var _default = GSCTheme;
exports.default = _default;
\ No newline at end of file
themeDefinition.js 0 → 100644
View file @ a8537b8e
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.default = void 0;
var _default = GSCTheme = {
gsc: {
// Core
navy: "#2e2d44",
teal: "#30b7bb",
offwhite: "#f1f4f5",
// Secondary
pink: "#e12a58",
gold: "#e5b94c",
// Tertiary
darkteal: "#036173",
blue: "#36a9e1",
lime: "#d5db40",
orange: "#e56a0c",
red: "#e40426",
purple: "#64335f",
green: "#22b573",
white: "#ffffff"
},
palette: {
primary: {
main: "#2e2d44",
contrastText: "#f1f4f5"
},
secondary: {
main: "#30b7bb",
contrastText: "#2e2d44"
},
error: {
main: "#e40426"
},
background: {
default: "#f1f4f5",
paper: "#ffffff"
}
},
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
},
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"
}
}
};
exports.default = _default;
\ No newline at end of file
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