Merge pull request #950 from microlinkhq/refactor

microlinkhq · Jul 5, 2020 · 11f8067 · 11f8067
2 parents e983d47 + 0b75725
commit 11f8067
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 50 deletions.
diff --git a/src/components/elements/Heading.js b/src/components/elements/Heading.js
@@ -10,7 +10,7 @@ Heading.defaultProps = {
   lineHeight: [0, 0, 1, 1],
   textAlign: 'center',
   fontWeight: 'bold',
-  fontSize: [4, 4, 5, 7],
+  fontSize: [5, 5, 5, 6],
   variant: 'gradient'
 }
 

diff --git a/src/components/elements/Link/solid.js b/src/components/elements/Link/solid.js
@@ -30,6 +30,10 @@ const style = css`
 const LinkSolid = styled(Link)`
   ${style};
   ${hoverStyle};
+
+  .active {
+    text-decoration: inherit;
+  }
 `
 
 LinkSolid.defaultProps = {

diff --git a/src/components/pages/screenshot/examples.js b/src/components/pages/screenshot/examples.js
@@ -340,7 +340,6 @@ export const Timings = ({ queryParam }) => {
                   color='white'
                   variant={null}
                   mr={[1, 1, 3, 3]}
-                  fontSize={[3, 3, 5, 7]}
                   children={children}
                 />
               ))}

diff --git a/src/components/patterns/Headline/Headline.js b/src/components/patterns/Headline/Headline.js
@@ -24,7 +24,6 @@ const TitleConstructor = TitleComponnet => ({
       {...props}
     >
       <TitleComponnet
-        maxWidth={['14rem', '100%', '100%', '100%']}
         fontWeight={fontWeight}
         fontSize={fontSize}
         px={0}

diff --git a/src/pages/oss.js b/src/pages/oss.js
@@ -11,9 +11,8 @@ export default () => {
     <DotsBackground alignItems='center' justifyContent='center'>
       <Layout footer={{ bg: 'transparent' }}>
         <Flex
-          px={4}
-          pt={4}
-          pb={4}
+          pt={[0, 0, 0, 3]}
+          px={3}
           width='100%'
           flexDirection='column'
           justifyContent='center'
@@ -22,7 +21,6 @@ export default () => {
           <Headline title='Open Source Software' pb={3} />
           <Text
             fontSize={[2, 2, 2, 3]}
-            fontWeight='regular'
             mb={4}
             textAlign='center'
             maxWidth={10}

diff --git a/src/pages/privacy.md b/src/pages/privacy.md
@@ -3,8 +3,8 @@ title: 'Privacy Policy'
 date: '2018-08-20'
 ---
 
-<Paraph fontSize={3}>
-  Your privacy is important to us. It's Microlink HQ's policy to respect
+<Paraph mt={0} fontSize={[2, 2, 2, 3]} textAlign='center'>
+  Microlink respects
   your privacy regarding any information we may collect from you across our
   website <Link href='https://microlink.io' children='microlink.io' />, and
   other sites we own and operate, according to EU General Data Protection

diff --git a/src/pages/stats.js b/src/pages/stats.js
@@ -34,15 +34,25 @@ export default () => {
             justifyContent='center'
             alignItems='center'
           >
-            <Container maxWidth='100%' px={[5, 5, 4, 4]}>
+            <Container maxWidth='100%' px={3}>
               <Box id='stats'>
                 {isLoading ? (
-                  <Text
-                    style={{ whiteSpace: 'pre', fontFamily: 'monospace' }}
-                    color={color}
-                    fontSize={[0, 0, 1, 1]}
-                    children={`\n${data}`}
-                  />
+                  <>
+                    <Text
+                      pt={[0, 0, 0, 3]}
+                      color={color}
+                      textAlign='center'
+                      style={{ fontFamily: 'monospace' }}
+                    >
+                      $ watch curl -sL https://k8s.microlink.io/
+                    </Text>
+                    <Text
+                      style={{ whiteSpace: 'pre', fontFamily: 'monospace' }}
+                      color={color}
+                      fontSize={[0, 0, 1, 1]}
+                      children={`\n${data}`}
+                    />
+                  </>
                 ) : (
                   <>
                     <Flex

diff --git a/src/templates/page.js b/src/templates/page.js
@@ -1,18 +1,15 @@
-import Markdown, {
-  H1,
-  H2,
-  Paraph,
-  Strong,
-  Link,
-  Blockquote
-} from 'components/markdown'
+import { withContainer } from 'helpers/hoc'
 
-import { Chat, Layout } from 'components/patterns'
+import Markdown, { H2, Paraph, Strong, Link } from 'components/markdown'
+
+import { Headline, Chat, Layout } from 'components/patterns'
 import { Text, Box } from 'components/elements'
 import { formatDate } from 'helpers'
 import TimeAgo from 'react-timeago'
 import React from 'react'
 
+const { WIDTH } = withContainer
+
 const PostFooter = () => (
   <>
     <H2 id='chat'>Come chat with us</H2>
@@ -32,37 +29,16 @@ const PostFooter = () => (
 
 export default ({ isBlogPage, date, meta, content }) => (
   <Layout {...meta}>
-    <Box px={3}>
-      <Text
-        as='header'
-        textAlign='center'
-        mb={5}
-        maxWidth='900px'
-        ml='auto'
-        mr='auto'
-      >
-        <H1
-          textAlign='center'
-          children={meta.title}
-          slug={false}
-          variant='gradient'
-          mb={3}
-        />
+    <Box pt={[0, 0, 0, 3]} px={3}>
+      <Text maxWidth={isBlogPage ? WIDTH.normal : 'none'} ml='auto' mr='auto'>
+        <Headline title={meta.title} pb={3} />
         {isBlogPage && (
-          <Text fontSize={2} color='black50'>
+          <Text fontSize={[2, 2, 2, 3]} textAlign='center' mb={4}>
             {formatDate(date)} ({<TimeAgo date={date} />})
           </Text>
         )}
       </Text>
 
-      {!isBlogPage && date && (
-        <Blockquote>
-          <Paraph>
-            Last Updated: {formatDate(date)} ({<TimeAgo date={date} />})
-          </Paraph>
-        </Blockquote>
-      )}
-
       <Markdown children={content} />
 
       {isBlogPage && <PostFooter />}