Spearhead
/
joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix Base.global fonts

This commit is contained in:
Sérgio Ramos 2017-02-24 13:29:50 +00:00
parent 5ec91c7275
commit ff83b4990f
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/webpack/base.js
View File

@ -63,9 +63,7 @@ module.exports = {
} }
}, { }, {
test: /js?$/, test: /js?$/,
loaders: [ loader: 'babel-loader',
'babel-loader'
],
exclude: /node_modules/, exclude: /node_modules/,
include: [ include: [
FRONTEND, FRONTEND,
@ -73,12 +71,10 @@ module.exports = {
], ],
}, { }, {
test: /\.svg/, test: /\.svg/,
loader: [ loader: 'file-loader',
'file-loader'
],
exclude: [ exclude: [
/node_modules/, /node_modules/,
path.join(UI, 'shared', 'fonts') path.join(UI, 'assets', 'fonts')
], ],
include: [ include: [
FRONTEND, FRONTEND,

1
ui/.babelrc
View File

@ -12,7 +12,6 @@
}] }]
], ],
"plugins": [ "plugins": [
"inline-react-svg",
"transform-class-properties", "transform-class-properties",
["transform-object-rest-spread", { ["transform-object-rest-spread", {
"useBuiltIns": true "useBuiltIns": true

2
ui/Makefile
View File

@ -42,7 +42,7 @@ install-production: compile
compile: install compile: install
mkdir -p dist mkdir -p dist
cp -R src/. dist/. cp -R src/. dist/.
$(bindir)/babel src --out-dir dist --source-maps inline $(bindir)/babel src --out-dir dist --source-maps inline --plugins=inline-react-svg
.PHONY: build .PHONY: build
build: build:

1
ui/src/components/base/global.js
View File

@ -70,6 +70,7 @@ const fontFaces = fonts.map(({
url('${filenames.svg}#${family}') format('svg'); url('${filenames.svg}#${family}') format('svg');
font-weight: ${weight}; font-weight: ${weight};
font-style: ${style}; font-style: ${style};
}
`); `);
export default css` export default css`