refactor between() media query helper

facebook · Sep 19, 2017 · 5e4dda9 · 5e4dda9
1 parent 7e7ee1c
commit 5e4dda9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/www/src/theme.js b/www/src/theme.js
@@ -55,11 +55,11 @@ type Size = $Keys<typeof SIZES>;
 
 const media = {
   between(smallKey: Size, largeKey: Size, excludeLarge: Boolean = false) {
-    if (SIZES[largeKey].max === Infinity && !excludeLarge) {
-      return `@media (min-width: ${SIZES[smallKey].min}px)`;
+    if (excludeLarge) {
+      return `@media (min-width: ${SIZES[smallKey].min}px) and (max-width: ${SIZES[largeKey].min - 1}px)`;
     } else {
-      if (excludeLarge) {
-        return `@media (min-width: ${SIZES[smallKey].min}px) and (max-width: ${SIZES[largeKey].min - 1}px)`;
+      if (SIZES[largeKey].max === Infinity) {
+        return `@media (min-width: ${SIZES[smallKey].min}px)`;
       } else {
         return `@media (min-width: ${SIZES[smallKey].min}px) and (max-width: ${SIZES[largeKey].max}px)`;
       }