Skip to content

Commit 2a85a09

Browse files
authored
Merge branch 'master' into convert-editor-to-typescript
2 parents d905339 + 19e84f8 commit 2a85a09

Some content is hidden

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

58 files changed

+518
-183
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
- Fixed link to Gatsby Plugin page in `getting-started` page. Issue #602
99
- Fix broken base-preset link on `theming` page
1010
- Add `@theme-ui/preset-sketchy`
11+
- `@theme-ui/prism`: add support for highlighting lines #895
12+
- `@theme-ui/style-guide`: pass `size` prop to ColorRow component #941
1113

1214
## v0.3.0 2020-01-22
1315

examples/codesandbox-starter/package.json

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

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-alpha.2",
4+
"version": "0.4.0-alpha.3",
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-alpha.2"
20+
"theme-ui": "^0.4.0-alpha.3"
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-alpha.2",
4+
"version": "0.4.0-alpha.3",
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-alpha.2"
20+
"theme-ui": "^0.4.0-alpha.3"
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-alpha.2",
4+
"version": "0.4.0-alpha.3",
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-alpha.1",
18+
"gatsby-plugin-theme-ui": "^0.4.0-alpha.3",
1919
"react": "^16.8.6",
2020
"react-dom": "^16.8.6",
21-
"theme-ui": "^0.4.0-alpha.2"
21+
"theme-ui": "^0.4.0-alpha.3"
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-alpha.2",
4+
"version": "0.4.0-alpha.3",
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-alpha.2"
20+
"theme-ui": "^0.4.0-alpha.3"
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-alpha.2",
4+
"version": "0.4.0-alpha.3",
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-alpha.2"
19+
"theme-ui": "^0.4.0-alpha.3"
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-alpha.2",
4+
"version": "0.4.0-alpha.3",
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-alpha.2"
22+
"theme-ui": "^0.4.0-alpha.3"
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-alpha.2",
4+
"version": "0.4.0-alpha.3",
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-alpha.2",
22+
"theme-ui": "^0.4.0-alpha.3",
2323
"theme-ui-typography": "^0.1.7",
2424
"typography-theme-fairy-gates": "^0.16.19"
2525
}

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.4.0-alpha.2",
2+
"version": "0.4.0-alpha.3",
33
"npmClient": "yarn",
44
"useWorkspaces": true,
55
"packages": ["packages/*"]

0 commit comments

Comments
 (0)