From f42bb0b2bc4b23bfcc465c2f11a950a8e76ffe6c Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Fri, 25 Aug 2017 14:11:57 -0400
Subject: [PATCH] Combine rulesets from all matching mixins

---
 src/tailwind.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/tailwind.js b/src/tailwind.js
index 9928629a2..3fe05aa3c 100644
--- a/src/tailwind.js
+++ b/src/tailwind.js
@@ -8,20 +8,19 @@ const shadows = require('./generators/shadows')
 const flex = require('./generators/flex')
 
 function findMixin(css, mixin, onError) {
-  let match
+  const matches = []
 
   css.walkRules((rule) => {
     if (_.trimStart(rule.selector, '.') === mixin) {
-      match = rule
-      return false
+      matches.push(rule)
     }
   })
 
-  if (_.isUndefined(match) && _.isFunction(onError)) {
+  if (_.isEmpty(matches) && _.isFunction(onError)) {
     onError()
   }
 
-  return match.clone().nodes
+  return _.flatten(matches.map(match => match.clone().nodes))
 }
 
 function addCustomMediaQueries(css, { breakpoints }) {