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

removing html data property on base elemenet used for testing and removing double string interpolation in font function

This commit is contained in:
Alex Windett 2017-01-10 13:20:33 +00:00
parent 999c3facf2
commit 8f75a6fd6e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/src/shared/functions.js
View File

@ -22,16 +22,16 @@ const generateFonts = (fontFamilies, fontFilenames) => {
fontCSS += ` fontCSS += `
@font-face { @font-face {
font-family: ${fontFamily}; font-family: ${fontFamily};
src: url(${pathToFont}${fontFilenames[i]}.eot); src: url(${pathToFont + fontFilenames[i]}.eot);
src: url(${pathToFont}${fontFilenames[i]}.eot?#iefix) src: url(${pathToFont + fontFilenames[i]}.eot?#iefix)
format('embedded-opentype'); format('embedded-opentype');
src: url(${pathToFont}${fontFilenames[i]}.woff) src: url(${pathToFont + fontFilenames[i]}.woff)
format('woff'); format('woff');
src: url(${pathToFont}${fontFilenames[i]}.woff2) src: url(${pathToFont + fontFilenames[i]}.woff2)
format('woff2'); format('woff2');
src: url(${pathToFont}${fontFilenames[i]}.ttf) src: url(${pathToFont + fontFilenames[i]}.ttf)
format('truetype'); format('truetype');
src: url(${pathToFont}${fontFilenames[i]}.svg#${fontFamily}) src: url(${pathToFont + fontFilenames[i]}.svg#${fontFamily})
format('svg'); format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;

2
ui/stories/index.js
View File

@ -66,7 +66,7 @@ const styles = {
storiesOf('Grid', module) storiesOf('Grid', module)
.add('Row and Column', () => ( .add('Row and Column', () => (
<Base data-id="base"> <Base>
<Container fluid> <Container fluid>
<Row> <Row>
<Column <Column