From efc7927078b92d1a885048b580c5c7b12e66be34 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 31 Jan 2019 19:44:19 -0500 Subject: [PATCH] Rename styles to theme --- css/preflight.css | 2 +- defaultConfig.stub.js | 2 +- src/corePlugins.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/preflight.css b/css/preflight.css index 6dd950366..f0f877063 100644 --- a/css/preflight.css +++ b/css/preflight.css @@ -439,7 +439,7 @@ ul { *::after { border-width: 0; border-style: solid; - border-color: config('styles.borderColors.default', currentColor); + border-color: config('theme.borderColors.default', currentColor); } /** diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 2004cf0da..d4d51350b 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -763,7 +763,7 @@ module.exports = { 'lg': '992px', 'xl': '1200px', }, - styles: styles, + theme: styles, variants: { appearance: ['responsive'], backgroundAttachment: ['responsive'], diff --git a/src/corePlugins.js b/src/corePlugins.js index 79f1dfa30..4d1f61249 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -49,11 +49,11 @@ import whitespace from './plugins/whitespace' import width from './plugins/width' import zIndex from './plugins/zIndex' -function loadPlugins({ styles, variants, corePlugins }, plugins) { +function loadPlugins({ theme, variants, corePlugins }, plugins) { return Object.keys(plugins) .filter(plugin => corePlugins[plugin] !== false) .map(plugin => plugins[plugin]({ - values: styles[plugin], + values: theme[plugin], variants: variants[plugin], })) }