From 57e539ed41af9a5a0f8d8e2454c7b45c1b4c2986 Mon Sep 17 00:00:00 2001
From: Ezekiel Aquino <ezekiel@bakkenbaeck.no>
Date: Fri, 30 Nov 2018 15:07:42 +0100
Subject: Allows margin to be passed variable integers as values, adds comments

---
 packages/website/ts/@next/components/layout.tsx | 6 +++---
 packages/website/ts/@next/pages/landing.tsx     | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'packages/website')

diff --git a/packages/website/ts/@next/components/layout.tsx b/packages/website/ts/@next/components/layout.tsx
index 47d9173c3..4621d1e8e 100644
--- a/packages/website/ts/@next/components/layout.tsx
+++ b/packages/website/ts/@next/components/layout.tsx
@@ -27,7 +27,7 @@ interface SectionProps {
 interface WrapProps {
     width?: 'default' | 'full' | 'medium' | 'narrow';
     bgColor?: string;
-    margin?: number | (string | number)[];
+    margin?: number | ('large' | 'default' | number)[];
 }
 
 interface ColumnProps {
@@ -50,10 +50,10 @@ const _getColumnWidth = (args: GetColWidthArgs) => {
 };
 
 const _getPadding = (value: number | (string | number)[]) => {
-    let padding = '';
+    let padding: string = '';
 
     if (Array.isArray(value)) {
-        padding = value.map(val => PADDING_SIZES[val] || '0px').join(' ');
+        padding = value.map(val => PADDING_SIZES[val] || `${val}px`).join(' ');
     } else {
         padding = `${value}px`;
     }
diff --git a/packages/website/ts/@next/pages/landing.tsx b/packages/website/ts/@next/pages/landing.tsx
index 2793993f9..98ee034b9 100644
--- a/packages/website/ts/@next/pages/landing.tsx
+++ b/packages/website/ts/@next/pages/landing.tsx
@@ -69,6 +69,7 @@ export const NextLanding = () => (
                 </Button>
             </WrapCentered>
 
+            {/* Note you can also pass in a string "large/default" or a number for custom margins */}
             <Wrap margin={['large', 0, 0, 0]}>
                 {/* NOTE: this probably should be withComponent as part of a <dl> */}
                 <Column colWidth="1/3" noPadding>
-- 
cgit v1.2.3