Merge branch 'master' into 5939/filter-pills

keystonejs · Jun 28, 2021 · 06429d6 · 06429d6
2 parents d3aaaf5 + 27cfdb2
commit 06429d6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/docs/components/content/CommunityCta.tsx b/docs/components/content/CommunityCta.tsx
@@ -19,8 +19,9 @@ export function CommunityCta(props: HTMLAttributes<HTMLElement>) {
     <Section
       css={mq({
         display: 'grid',
-        gridTemplateColumns: ['1fr', null, '1fr 1fr', '1.2fr 0.8fr'],
-        gap: '1rem',
+        gridTemplateColumns: ['1fr', null, '1fr 1fr', '1.1fr 0.9fr'],
+        gap: '3rem',
+        alignItems: 'center',
         border: '1px solid var(--border)',
         borderRadius: '1rem',
         padding: '2rem',
@@ -45,11 +46,15 @@ export function CommunityCta(props: HTMLAttributes<HTMLElement>) {
           height={928}
         />
       </div>
-      <div>
-        <Type as="h2" look="heading36">
+      <div
+        css={{
+          paddingRight: '.3rem',
+        }}
+      >
+        <Type as="h2" look="heading30">
           Learn with others in a supportive community
         </Type>
-        <Type as="p" look="body18" margin="2rem 0">
+        <Type as="p" look="body18" margin="1rem 0">
           Share your work and get the help you need in the Keystone community Slack: an inclusive
           space to share ideas and explore what‘s possible.
         </Type>
@@ -58,6 +63,9 @@ export function CommunityCta(props: HTMLAttributes<HTMLElement>) {
           href="https://community.keystonejs.com"
           target="_blank"
           rel="noopener noreferrer"
+          css={{
+            marginTop: '1rem',
+          }}
         >
           Join the community Slack <ArrowR />
         </Button>
@@ -79,12 +87,12 @@ export function CommunityCta(props: HTMLAttributes<HTMLElement>) {
           }}
         >
           <li>
-            <Tick grad="grad1" />
-            <Type look="body18">1900+ members</Type>
+            <Tick grad="grad4" />
+            <Type look="body16">1900+ members</Type>
           </li>
           <li>
-            <Tick grad="grad1" />
-            <Type look="body18">Personalised support</Type>
+            <Tick grad="grad4" />
+            <Type look="body16">Personalised support</Type>
           </li>
         </ul>
       </div>

diff --git a/docs/components/primitives/Type.tsx b/docs/components/primitives/Type.tsx
@@ -8,7 +8,7 @@ const common = {
   brand: {
     fontFamily: 'var(--font-brand)',
     color: 'var(--text-heading)',
-    lineHeight: 1.1,
+    lineHeight: 1.3,
   },
   body: {
     fontFamily: 'var(--font-body)',
@@ -70,7 +70,7 @@ export const styleMap = {
     fontSize: '5.75rem',
     fontWeight: 900,
     letterSpacing: '-0.025em',
-    lineHeight: 1.1,
+    lineHeight: 1.2,
   },
 
   body12: {

diff --git a/examples/document-field/README.md b/examples/document-field/README.md
@@ -24,7 +24,6 @@ yarn dev:site
 
 This will start the frontend at [localhost:3001](http://localhost:3001).
 
-
 ## Configuring fields
 
 The project contains two `document` fields which show how to use the field configuration options to customise the document editor in the Admin UI.