From 2e4e4a79e229866586de033276161a121887ab99 Mon Sep 17 00:00:00 2001 From: fedeTibaldo Date: Fri, 9 Feb 2018 20:57:34 +0100 Subject: [PATCH] Revert output order from hover-active-focus to focus-active-hover --- __tests__/variantsAtRule.test.js | 12 ++++++------ src/lib/substituteVariantsAtRules.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/__tests__/variantsAtRule.test.js b/__tests__/variantsAtRule.test.js index b4d1d9d09..58bbaaf02 100644 --- a/__tests__/variantsAtRule.test.js +++ b/__tests__/variantsAtRule.test.js @@ -101,12 +101,12 @@ test('it can generate hover, active and focus variants', () => { const output = ` .banana { color: yellow; } .chocolate { color: brown; } - .hover\\:banana:hover { color: yellow; } - .hover\\:chocolate:hover { color: brown; } - .active\\:banana:active { color: yellow; } - .active\\:chocolate:active { color: brown; } .focus\\:banana:focus { color: yellow; } .focus\\:chocolate:focus { color: brown; } + .active\\:banana:active { color: yellow; } + .active\\:chocolate:active { color: brown; } + .hover\\:banana:hover { color: yellow; } + .hover\\:chocolate:hover { color: brown; } ` return run(input).then(result => { @@ -127,10 +127,10 @@ test('it wraps the output in a responsive at-rule if responsive is included as a @responsive { .banana { color: yellow; } .chocolate { color: brown; } - .hover\\:banana:hover { color: yellow; } - .hover\\:chocolate:hover { color: brown; } .focus\\:banana:focus { color: yellow; } .focus\\:chocolate:focus { color: brown; } + .hover\\:banana:hover { color: yellow; } + .hover\\:chocolate:hover { color: brown; } } ` diff --git a/src/lib/substituteVariantsAtRules.js b/src/lib/substituteVariantsAtRules.js index 9df30520b..1487471f1 100644 --- a/src/lib/substituteVariantsAtRules.js +++ b/src/lib/substituteVariantsAtRules.js @@ -61,7 +61,7 @@ export default function(config) { atRule.before(atRule.clone().nodes) - _.forEach(['hover', 'active', 'focus', 'group-hover'], variant => { + _.forEach(['focus', 'active', 'hover', 'group-hover'], variant => { if (variants.includes(variant)) { variantGenerators[variant](atRule, unwrappedConfig) }