From ea4b64837e92c755aca12dd924f8a1a12091fada Mon Sep 17 00:00:00 2001 From: Jonathan Reinink Date: Wed, 25 Oct 2017 18:18:22 -0400 Subject: [PATCH] Allow font families to be defined as arrays --- __tests__/fixtures/tailwind.css | 20 ++++++++++---------- src/generators/textFonts.js | 4 ++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/__tests__/fixtures/tailwind.css b/__tests__/fixtures/tailwind.css index 889c254aa..7b832cd17 100644 --- a/__tests__/fixtures/tailwind.css +++ b/__tests__/fixtures/tailwind.css @@ -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, diff --git a/src/generators/textFonts.js b/src/generators/textFonts.js index 40e676d97..85accaabf 100644 --- a/src/generators/textFonts.js +++ b/src/generators/textFonts.js @@ -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}`, })