From df8fe5afa67e5325cfc10cc437934ffeca3a5436 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 14 Feb 2019 15:23:22 -0500 Subject: [PATCH] Rename borderColors to borderColor --- defaultConfig.stub.js | 2 +- defaultTheme.js | 2 +- plugins/borderColor.js | 1 + plugins/borderColors.js | 1 - src/corePlugins.js | 4 ++-- src/plugins/{borderColors.js => borderColor.js} | 0 src/plugins/css/preflight.css | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 plugins/borderColor.js delete mode 100644 plugins/borderColors.js rename src/plugins/{borderColors.js => borderColor.js} (100%) diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 30e0bd670..7f4d6093e 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -13,7 +13,7 @@ module.exports = { backgroundRepeat: ['responsive'], backgroundSize: ['responsive'], borderCollapse: [], - borderColors: ['responsive', 'hover', 'focus'], + borderColor: ['responsive', 'hover', 'focus'], borderRadius: ['responsive'], borderStyle: ['responsive'], borderWidths: ['responsive'], diff --git a/defaultTheme.js b/defaultTheme.js index 27b40c215..8e5d122a1 100644 --- a/defaultTheme.js +++ b/defaultTheme.js @@ -178,7 +178,7 @@ module.exports = function() { '4': '4px', '8': '8px', }, - borderColors: theme => { + borderColor: theme => { return global.Object.assign({ default: theme.colors['grey-light'] }, theme.colors) }, borderRadius: { diff --git a/plugins/borderColor.js b/plugins/borderColor.js new file mode 100644 index 000000000..006b437a4 --- /dev/null +++ b/plugins/borderColor.js @@ -0,0 +1 @@ +module.exports = require('../lib/plugins/borderColor').default diff --git a/plugins/borderColors.js b/plugins/borderColors.js deleted file mode 100644 index 77bb95775..000000000 --- a/plugins/borderColors.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../lib/plugins/borderColors').default diff --git a/src/corePlugins.js b/src/corePlugins.js index 7637e6573..8685e128b 100644 --- a/src/corePlugins.js +++ b/src/corePlugins.js @@ -7,7 +7,7 @@ import backgroundPosition from './plugins/backgroundPosition' import backgroundRepeat from './plugins/backgroundRepeat' import backgroundSize from './plugins/backgroundSize' import borderCollapse from './plugins/borderCollapse' -import borderColors from './plugins/borderColors' +import borderColor from './plugins/borderColor' import borderRadius from './plugins/borderRadius' import borderStyle from './plugins/borderStyle' import borderWidths from './plugins/borderWidths' @@ -78,7 +78,7 @@ export default function(config) { backgroundRepeat, backgroundSize, borderCollapse, - borderColors, + borderColor, borderRadius, borderStyle, borderWidths, diff --git a/src/plugins/borderColors.js b/src/plugins/borderColor.js similarity index 100% rename from src/plugins/borderColors.js rename to src/plugins/borderColor.js diff --git a/src/plugins/css/preflight.css b/src/plugins/css/preflight.css index 56a532c18..24d4dcc20 100644 --- a/src/plugins/css/preflight.css +++ b/src/plugins/css/preflight.css @@ -89,7 +89,7 @@ ul { *::after { border-width: 0; border-style: solid; - border-color: config('theme.borderColors.default', currentColor); + border-color: config('theme.borderColor.default', currentColor); } /**