From d3c65e55af3a80f3e0a0510400084950067f4664 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Tue, 12 Feb 2019 15:14:35 -0500 Subject: [PATCH] Rename fonts plugin to fontFamily --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/fontFamily.js | 1 + plugins/fonts.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{fonts.js => fontFamily.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 plugins/fontFamily.js delete mode 100644 plugins/fonts.js rename src/plugins/{fonts.js => fontFamily.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index e204a0437..66f1da688 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -21,7 +21,7 @@ module.exports = { display: ['responsive'], flexbox: ['responsive'], float: ['responsive'], - fonts: ['responsive'], + fontFamily: ['responsive'], fontWeights: ['responsive', 'hover', 'focus'], height: ['responsive'], leading: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index d940c29ae..de29a6a15 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -91,7 +91,7 @@ module.exports = function() { lg: '992px', xl: '1200px', }, - fonts: { + fontFamily: { sans: [ 'system-ui', 'BlinkMacSystemFont', diff --git a/plugins/fontFamily.js b/plugins/fontFamily.js new file mode 100644 index 000000000..917cd1572 --- /dev/null +++ b/plugins/fontFamily.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/fontFamily').default diff --git a/plugins/fonts.js b/plugins/fonts.js deleted file mode 100644 index cc2b7b5d6..000000000 --- a/plugins/fonts.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/fonts').default diff --git a/src/corePlugins.js b/src/corePlugins.js index ede2c9b04..40ea0458c 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -15,7 +15,7 @@ import cursor from './plugins/cursor' import display from './plugins/display' import flexbox from './plugins/flexbox' import float from './plugins/float' -import fonts from './plugins/fonts' +import fontFamily from './plugins/fontFamily' import fontWeights from './plugins/fontWeights' import height from './plugins/height' import leading from './plugins/leading' @@ -86,7 +86,7 @@ export default function(config) { display, flexbox, float, - fonts, + fontFamily, fontWeights, height, leading, diff --git a/src/plugins/fonts.js b/src/plugins/fontFamily.js similarity index 100% rename from src/plugins/fonts.js rename to src/plugins/fontFamily.js