Skip to content

Commit

Permalink
Merge branch 'master' into #59-singular-use-case-page
Browse files Browse the repository at this point in the history
  • Loading branch information
samgildea committed May 7, 2021
2 parents 9e2b528 + c4756f0 commit bb6f72a
Show file tree
Hide file tree
Showing 4 changed files with 186 additions and 2 deletions.
182 changes: 182 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"test": "echo \"Write tests! -> https://gatsby.dev/unit-testing\" && exit 1"
},
"dependencies": {
"@emotion/react": "^11.4.0",
"@emotion/styled": "^11.3.0",
"@walltowall/gatsby-source-prismic-schemas": "^1.1.0",
"gatsby": "^2.26.1",
"gatsby-background-image": "^1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/solutions/solutions-styles.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from "styled-components"
import styled from '@emotion/styled'
import colors from "../../style/colors"
import dimensions from "../../style/dimensions"
import {
Expand Down
2 changes: 1 addition & 1 deletion src/style/type-styles.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from "styled-components"
import styled from "@emotion/styled"

const minSize = {
h1: 50,
Expand Down

0 comments on commit bb6f72a

Please sign in to comment.