Skip to content

Commit 34310e1

Browse files
author
LB
authored
Merge pull request #937 from hasparus/ts-enable-highlighting
merge master to enable-highlighting
2 parents 4b1b89f + cda32af commit 34310e1

File tree

108 files changed

+1428
-733
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1428
-733
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Unreleased
44

5+
- Make ThemeProvider `theme` prop required
56
- Removes overriding property on editor combobox
67
- Adjust media query sort logic #600
78
- Fixed link to Gatsby Plugin page in `getting-started` page. Issue #602

examples/codesandbox-starter/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "theme-ui-starter",
3-
"private": "true",
4-
"version": "0.4.0-highlight.0",
3+
"private": true,
4+
"version": "0.4.0-alpha.1",
55
"description": "A sandbox configured with Theme UI, including the `base` theme.",
66
"main": "index.html",
77
"scripts": {
@@ -11,10 +11,10 @@
1111
"dependencies": {
1212
"@emotion/core": "^10.0.17",
1313
"@mdx-js/react": "^1.4.5",
14-
"@theme-ui/presets": "^0.4.0-highlight.0",
14+
"@theme-ui/presets": "^0.4.0-alpha.1",
1515
"react": "^16.12.0",
1616
"react-dom": "^16.9.0",
17-
"theme-ui": "^0.4.0-highlight.0"
17+
"theme-ui": "^0.4.0-alpha.1"
1818
},
1919
"devDependencies": {
2020
"@babel/core": "^7.7.4",

examples/codesandbox-starter/src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { jsx, Layout, Styled } from 'theme-ui'
66

77
function App() {
88
return (
9-
<ThemeProvider>
9+
<ThemeProvider theme={{}}>
1010
<Layout sx={{ p: 3 }}>
1111
<Reset />
1212
<Styled.h1 sx={{ color: 'primary', mb: 3 }}>Hello Theme UI</Styled.h1>

examples/custom-pragma/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "custom-pragma-example",
4-
"version": "0.4.0-highlight.0",
4+
"version": "0.4.0-alpha.1",
55
"main": "index.js",
66
"author": "Brent Jackson <[email protected]>",
77
"license": "MIT",
@@ -17,6 +17,6 @@
1717
"gatsby-plugin-mdx": "^1.0.4",
1818
"react": "^16.8.6",
1919
"react-dom": "^16.8.6",
20-
"theme-ui": "^0.4.0-highlight.0"
20+
"theme-ui": "^0.4.0-alpha.1"
2121
}
2222
}

examples/dark-mode/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "dark-mode-theme-ui-example",
4-
"version": "0.4.0-highlight.0",
4+
"version": "0.4.0-alpha.1",
55
"main": "index.js",
66
"author": "Brent Jackson <[email protected]>",
77
"license": "MIT",
@@ -17,6 +17,6 @@
1717
"gatsby-plugin-mdx": "^1.0.4",
1818
"react": "^16.8.6",
1919
"react-dom": "^16.8.6",
20-
"theme-ui": "^0.4.0-highlight.0"
20+
"theme-ui": "^0.4.0-alpha.1"
2121
}
2222
}

examples/gatsby-plugin/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "gatsby-plugin-theme-ui-example",
4-
"version": "0.4.0-highlight.0",
4+
"version": "0.4.0-alpha.1",
55
"main": "index.js",
66
"author": "Brent Jackson <[email protected]>",
77
"license": "MIT",
@@ -15,10 +15,10 @@
1515
"@mdx-js/react": "^1.0.16",
1616
"gatsby": "^2.6.3",
1717
"gatsby-plugin-mdx": "^1.0.4",
18-
"gatsby-plugin-theme-ui": "^0.4.0-highlight.0",
18+
"gatsby-plugin-theme-ui": "^0.4.0-alpha.1",
1919
"react": "^16.8.6",
2020
"react-dom": "^16.8.6",
21-
"theme-ui": "^0.4.0-highlight.0"
21+
"theme-ui": "^0.4.0-alpha.1"
2222
},
2323
"devDependencies": {
2424
"@testing-library/react": "^9.1.3",

examples/gatsby/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "gatsby-theme-ui-example",
4-
"version": "0.4.0-highlight.0",
4+
"version": "0.4.0-alpha.1",
55
"main": "index.js",
66
"author": "Brent Jackson <[email protected]>",
77
"license": "MIT",
@@ -17,6 +17,6 @@
1717
"gatsby-plugin-mdx": "^1.0.4",
1818
"react": "^16.8.6",
1919
"react-dom": "^16.8.6",
20-
"theme-ui": "^0.4.0-highlight.0"
20+
"theme-ui": "^0.4.0-alpha.1"
2121
}
2222
}

examples/next/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "next-theme-ui-example",
4-
"version": "0.4.0-highlight.0",
4+
"version": "0.4.0-alpha.1",
55
"main": "index.js",
66
"author": "Brent Jackson <[email protected]>",
77
"license": "MIT",
@@ -16,6 +16,6 @@
1616
"next": "^9.3.4",
1717
"react": "^16.13.1",
1818
"react-dom": "^16.13.1",
19-
"theme-ui": "^0.4.0-highlight.0"
19+
"theme-ui": "^0.4.0-alpha.1"
2020
}
2121
}

examples/prism/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "prism-theme-ui-example",
4-
"version": "0.4.0-highlight.0",
4+
"version": "0.4.0-alpha.1",
55
"main": "index.js",
66
"author": "Brent Jackson <[email protected]>",
77
"license": "MIT",
@@ -19,6 +19,6 @@
1919
"prismjs": "^1.16.0",
2020
"react": "^16.8.6",
2121
"react-dom": "^16.8.6",
22-
"theme-ui": "^0.4.0-highlight.0"
22+
"theme-ui": "^0.4.0-alpha.1"
2323
}
2424
}

examples/typography/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "typography-js-theme-ui-example",
4-
"version": "0.4.0-highlight.0",
4+
"version": "0.4.0-alpha.1",
55
"main": "index.js",
66
"author": "Brent Jackson <[email protected]>",
77
"license": "MIT",
@@ -19,7 +19,7 @@
1919
"lodash.merge": "^4.6.1",
2020
"react": "^16.8.6",
2121
"react-dom": "^16.8.6",
22-
"theme-ui": "^0.4.0-highlight.0",
22+
"theme-ui": "^0.4.0-alpha.1",
2323
"theme-ui-typography": "^0.1.7",
2424
"typography-theme-fairy-gates": "^0.16.19"
2525
}

0 commit comments

Comments
 (0)