Allow font families to be defined as arrays

This commit is contained in:
Jonathan Reinink 2017-10-25 18:18:22 -04:00
parent 3e58d198d8
commit ea4b64837e
2 changed files with 14 additions and 10 deletions

View file

@ -673,11 +673,11 @@ button,
}
.font-serif {
font-family: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif;
font-family: Constantia, Lucida Bright, Lucidabright, Lucida Serif, Lucida, DejaVu Serif, Bitstream Vera Serif, Liberation Serif, Georgia, serif;
}
.font-mono {
font-family: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace;
}
.text-black,
@ -3419,11 +3419,11 @@ button,
}
.sm\:font-serif {
font-family: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif;
font-family: Constantia, Lucida Bright, Lucidabright, Lucida Serif, Lucida, DejaVu Serif, Bitstream Vera Serif, Liberation Serif, Georgia, serif;
}
.sm\:font-mono {
font-family: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace;
}
.sm\:text-black,
@ -6166,11 +6166,11 @@ button,
}
.md\:font-serif {
font-family: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif;
font-family: Constantia, Lucida Bright, Lucidabright, Lucida Serif, Lucida, DejaVu Serif, Bitstream Vera Serif, Liberation Serif, Georgia, serif;
}
.md\:font-mono {
font-family: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace;
}
.md\:text-black,
@ -8913,11 +8913,11 @@ button,
}
.lg\:font-serif {
font-family: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif;
font-family: Constantia, Lucida Bright, Lucidabright, Lucida Serif, Lucida, DejaVu Serif, Bitstream Vera Serif, Liberation Serif, Georgia, serif;
}
.lg\:font-mono {
font-family: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace;
}
.lg\:text-black,
@ -11660,11 +11660,11 @@ button,
}
.xl\:font-serif {
font-family: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif;
font-family: Constantia, Lucida Bright, Lucidabright, Lucida Serif, Lucida, DejaVu Serif, Bitstream Vera Serif, Liberation Serif, Georgia, serif;
}
.xl\:font-mono {
font-family: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace;
}
.xl\:text-black,

View file

@ -3,6 +3,10 @@ import defineClass from '../util/defineClass'
export default function ({ fonts }) {
return _.map(fonts, (families, font) => {
if (_.isArray(families)) {
families = families.join(', ')
}
return defineClass(`font-${font}`, {
'font-family': `${families}`,
})