Merge branch 'master' into next

louisgv · Aug 9, 2020 · 1d2b14d · 1d2b14d
2 parents 472a9da + 3c07186
commit 1d2b14d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -87,6 +87,7 @@ Look here 👉 _[emotion babel plugin feature table and documentation](https://g
 - [polished](https://github.com/styled-components/polished) - Lightweight set of Sass/Compass-style mixins/helpers for writing styles in JavaScript.
 - [monad-ui](https://github.com/muhajirdev/monad-ui/) - Utility First CSS-In-JS
 - [css-in-js-media](https://github.com/zx6658/css-in-js-media) - you can deal with responsive design using css-in-js easily with this `css-in-js-media` which is similar with include-media
+- [emotion-native-extended](https://github.com/ItsWendell/emotion-native-extended) - Better styling support for Emotion Native with [React Native Extended Stylesheet](https://github.com/vitalets/react-native-extended-stylesheet)
 
 ### In the Wild
 

diff --git a/site/src/components/DocWrapper.js b/site/src/components/DocWrapper.js
@@ -177,10 +177,7 @@ export default ({
                   'none',
                   'none',
                   `1px solid ${colors.lighten(0.25, colors.border)}`
-                ],
-                filter: 'grayscale(100%)',
-                // needed for the filter above, Chrome messed up layers without it
-                zIndex: 1
+                ]
               })}
             >
               <Search />
@@ -211,8 +208,7 @@ export default ({
                 ],
                 gridRow: 2,
                 gridColumn: ['1 / span 2', '1 / span 2', '1 / span 1'],
-                paddingRight: [0, 0, 0],
-                filter: 'grayscale(100%)'
+                paddingRight: [0, 0, 0]
               })}
             >
               {children}

diff --git a/site/src/components/SiteHeader.js b/site/src/components/SiteHeader.js
@@ -64,8 +64,7 @@ export default function SiteHeader() {
           paddingTop: 24,
           display: 'flex',
           alignItems: 'center',
-          paddingBottom: space[2],
-          filter: 'grayscale(100%)'
+          paddingBottom: space[2]
         }}
       >
         <Link

diff --git a/site/src/pages/404.js b/site/src/pages/404.js
@@ -7,14 +7,8 @@ const NotFoundPage = () => {
   const title = 'NOT FOUND'
   return (
     <Layout title={title}>
-      <div
-        css={{
-          filter: 'grayscale(100%)'
-        }}
-      >
-        <h1>{title}</h1>
-        <p>You just hit a route that doesn&#39;t exist... the sadness.😢</p>
-      </div>
+      <h1>{title}</h1>
+      <p>You just hit a route that doesn&#39;t exist... the sadness.😢</p>
     </Layout>
   )
 }

diff --git a/site/src/pages/community.js b/site/src/pages/community.js
@@ -16,8 +16,7 @@ const Community = (props: *) => {
     <Layout title={title}>
       <div
         css={mq({
-          gridColumn: '1 / span 2',
-          filter: 'grayscale(100%)'
+          gridColumn: '1 / span 2'
         })}
       >
         <div>

diff --git a/site/src/utils/style.js b/site/src/utils/style.js
@@ -16,7 +16,7 @@ export const colors = {
   darken2: darken(0.15),
   darken3: darken(0.2),
   reallyLightPink: '#f9e9fb',
-  hightlight: '#D36AC2',
+  hightlight: '#C43BAD',
   border: '#C865B9',
   bg: '#FAF9FA',
   color: '#1B1D1D',