Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	dist/0.9.1/scripts/core-libraries.js
#	dist/0.9.1/scripts/polyfills.js
#	dist/0.9.1/scripts/polyfills.js.map
  • Loading branch information
erikhallaraaker committed Aug 24, 2018
2 parents bdb9f61 + f5adfde commit 17b85c5
Show file tree
Hide file tree
Showing 33 changed files with 479 additions and 442 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

All notable changes to this project will be documented in this file.

## [0.9.1] - 2018-08-22

### Fixed

- Fixed issue with links not taking browser window to the top within the documentation.
- Fixed issue with loader element in button loaders.
- Fixed issue with the Progress tracker component responsiveness.

## [0.9.0] - 2018-08-22

### Added
Expand Down
1 change: 0 additions & 1 deletion dist/0.9.0/scripts/app.js.map

This file was deleted.

3 changes: 0 additions & 3 deletions dist/0.9.0/styles/px.css

This file was deleted.

1 change: 0 additions & 1 deletion dist/0.9.0/styles/px.css.map

This file was deleted.

1 change: 0 additions & 1 deletion dist/0.9.0/styles/templates/documentation.css.map

This file was deleted.

4 changes: 2 additions & 2 deletions dist/0.9.0/scripts/app.js → dist/0.9.1/scripts/app.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/0.9.1/scripts/app.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions dist/0.9.1/styles/px.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/0.9.1/styles/px.css.map

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

1 change: 1 addition & 0 deletions dist/0.9.1/styles/templates/documentation.css.map

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

4 changes: 2 additions & 2 deletions dist/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>PayEx DesignGuide</title>
<link rel="icon" type="image/png" sizes="32x32" href="/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/icons/favicon-16x16.png"><link rel="shortcut icon" href="/icons/favicon.ico"><link href="/0.9.0/styles/px.css?f165b44fddbc372e37af" rel="stylesheet"><link href="/0.9.0/styles/templates/documentation.css?f165b44fddbc372e37af" rel="stylesheet"><link href="/styles/designguide.css?f165b44fddbc372e37af" rel="stylesheet"></head>
<link rel="icon" type="image/png" sizes="32x32" href="/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/icons/favicon-16x16.png"><link rel="shortcut icon" href="/icons/favicon.ico"><link href="/0.9.1/styles/px.css?949427db948cbd59a5e9" rel="stylesheet"><link href="/0.9.1/styles/templates/documentation.css?949427db948cbd59a5e9" rel="stylesheet"><link href="/styles/designguide.css?949427db948cbd59a5e9" rel="stylesheet"></head>
<body>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-3440932-20"></script>
Expand All @@ -30,5 +30,5 @@ <h2>Welcome to the PayEx DesignGuide</h2>
<div id="root"></div>
<script>window.stopPx=true</script>
<script src="https://www.gstatic.com/charts/loader.js"></script>
<script type="text/javascript" src="/0.9.0/scripts/px-script.js?f165b44fddbc372e37af&f165b44fddbc372e37af"></script><script type="text/javascript" src="/0.9.0/scripts/polyfills.js?f165b44fddbc372e37af&f165b44fddbc372e37af"></script><script type="text/javascript" src="/0.9.0/scripts/core-libraries.js?f165b44fddbc372e37af&f165b44fddbc372e37af"></script><script type="text/javascript" src="/0.9.0/scripts/react-libraries.js?f165b44fddbc372e37af&f165b44fddbc372e37af"></script><script type="text/javascript" src="/0.9.0/scripts/app.js?f165b44fddbc372e37af&f165b44fddbc372e37af"></script></body>
<script type="text/javascript" src="/0.9.1/scripts/px-script.js?949427db948cbd59a5e9&949427db948cbd59a5e9"></script><script type="text/javascript" src="/0.9.1/scripts/polyfills.js?949427db948cbd59a5e9&949427db948cbd59a5e9"></script><script type="text/javascript" src="/0.9.1/scripts/core-libraries.js?949427db948cbd59a5e9&949427db948cbd59a5e9"></script><script type="text/javascript" src="/0.9.1/scripts/react-libraries.js?949427db948cbd59a5e9&949427db948cbd59a5e9"></script><script type="text/javascript" src="/0.9.1/scripts/app.js?949427db948cbd59a5e9&949427db948cbd59a5e9"></script></body>
</html>
4 changes: 2 additions & 2 deletions dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>PayEx DesignGuide</title>
<link rel="icon" type="image/png" sizes="32x32" href="/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/icons/favicon-16x16.png"><link rel="shortcut icon" href="/icons/favicon.ico"><link href="/0.9.0/styles/px.css?f165b44fddbc372e37af" rel="stylesheet"><link href="/0.9.0/styles/templates/documentation.css?f165b44fddbc372e37af" rel="stylesheet"><link href="/styles/designguide.css?f165b44fddbc372e37af" rel="stylesheet"></head>
<link rel="icon" type="image/png" sizes="32x32" href="/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/icons/favicon-16x16.png"><link rel="shortcut icon" href="/icons/favicon.ico"><link href="/0.9.1/styles/px.css?949427db948cbd59a5e9" rel="stylesheet"><link href="/0.9.1/styles/templates/documentation.css?949427db948cbd59a5e9" rel="stylesheet"><link href="/styles/designguide.css?949427db948cbd59a5e9" rel="stylesheet"></head>
<body>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-3440932-20"></script>
Expand All @@ -30,5 +30,5 @@ <h2>Welcome to the PayEx DesignGuide</h2>
<div id="root"></div>
<script>window.stopPx=true</script>
<script src="https://www.gstatic.com/charts/loader.js"></script>
<script type="text/javascript" src="/0.9.0/scripts/px-script.js?f165b44fddbc372e37af&f165b44fddbc372e37af"></script><script type="text/javascript" src="/0.9.0/scripts/polyfills.js?f165b44fddbc372e37af&f165b44fddbc372e37af"></script><script type="text/javascript" src="/0.9.0/scripts/core-libraries.js?f165b44fddbc372e37af&f165b44fddbc372e37af"></script><script type="text/javascript" src="/0.9.0/scripts/react-libraries.js?f165b44fddbc372e37af&f165b44fddbc372e37af"></script><script type="text/javascript" src="/0.9.0/scripts/app.js?f165b44fddbc372e37af&f165b44fddbc372e37af"></script></body>
<script type="text/javascript" src="/0.9.1/scripts/px-script.js?949427db948cbd59a5e9&949427db948cbd59a5e9"></script><script type="text/javascript" src="/0.9.1/scripts/polyfills.js?949427db948cbd59a5e9&949427db948cbd59a5e9"></script><script type="text/javascript" src="/0.9.1/scripts/core-libraries.js?949427db948cbd59a5e9&949427db948cbd59a5e9"></script><script type="text/javascript" src="/0.9.1/scripts/react-libraries.js?949427db948cbd59a5e9&949427db948cbd59a5e9"></script><script type="text/javascript" src="/0.9.1/scripts/app.js?949427db948cbd59a5e9&949427db948cbd59a5e9"></script></body>
</html>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "design.payex.com",
"version": "0.9.0",
"version": "0.9.1",
"description": "PayEx DesignGuide",
"main": "index.js",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -510,28 +510,13 @@ exports[`Core: Typography Text Utilities renders 1`] = `
Text utilities
</h2>
<p>
Change text alignment, transform, style, weight, and color with our
Change text color with our
<Link
replace={false}
to="/docs/utilities/text"
>
text utilities
</Link>
<b>
(NOT YET IMPLEMENTED)
</b>
and
<Link
replace={false}
to="/docs/utilities/color"
to="/docs/utilities/colors"
>
color utilities
</Link>
<b>
(NOT YET IMPLEMENTED)
</b>
.
</p>
</React.Fragment>
Expand Down
2 changes: 1 addition & 1 deletion src/App/Documentation/core/Typography/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const Inline = () => (
const TextUtilities = () => (
<>
<h2 id="text-utilities">Text utilities</h2>
<p>Change text alignment, transform, style, weight, and color with our <Link to="/docs/utilities/text">text utilities</Link> <b>(NOT YET IMPLEMENTED)</b> and <Link to="/docs/utilities/color">color utilities</Link> <b>(NOT YET IMPLEMENTED)</b>.</p>
<p>Change text color with our <Link to="/docs/utilities/colors">color utilities</Link>.</p>
</>
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ exports[`GettingStarted: Introduction Css renders 1`] = `
language="html"
>
<link
href="https://design.payex.com/0.9.0/styles/px.css"
href="https://design.payex.com/0.9.1/styles/px.css"
rel="stylesheet"
/>
</ComponentPreview>
Expand Down Expand Up @@ -80,7 +80,7 @@ exports[`GettingStarted: Introduction JavaScript renders 1`] = `
language="html"
>
<script
src="https://design.payex.com/0.9.0/scripts/px-script.js"
src="https://design.payex.com/0.9.1/scripts/px-script.js"
/>
</ComponentPreview>
</React.Fragment>
Expand Down Expand Up @@ -125,7 +125,7 @@ exports[`GettingStarted: Introduction StarterTemplate renders 1`] = `
name="viewport"
/>
<link
href="https://design.payex.com/0.9.0/styles/px.css"
href="https://design.payex.com/0.9.1/styles/px.css"
rel="stylesheet"
/>
<title>
Expand All @@ -137,7 +137,7 @@ exports[`GettingStarted: Introduction StarterTemplate renders 1`] = `
Hello, PayEx!
</h1>
<script
src="https://design.payex.com/0.9.0/scripts/px-script.js"
src="https://design.payex.com/0.9.1/scripts/px-script.js"
/>
</body>
</html>
Expand Down
88 changes: 45 additions & 43 deletions src/App/__snapshots__/index.test.js.snap
Original file line number Diff line number Diff line change
@@ -1,49 +1,51 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Main: App renders 1`] = `
<Router
history={
Object {
"action": "POP",
"block": [Function],
"createHref": [Function],
"go": [Function],
"goBack": [Function],
"goForward": [Function],
"length": 1,
"listen": [Function],
"location": Object {
"hash": "",
"pathname": "blank",
"search": "",
"state": undefined,
},
"push": [Function],
"replace": [Function],
}
}
<div
id="px-designguide"
>
<div
id="px-designguide"
<Router
history={
Object {
"action": "POP",
"block": [Function],
"createHref": [Function],
"go": [Function],
"goBack": [Function],
"goForward": [Function],
"length": 1,
"listen": [Function],
"location": Object {
"hash": "",
"pathname": "blank",
"search": "",
"state": undefined,
},
"push": [Function],
"replace": [Function],
}
}
>
<withRouter(AppHeader) />
<Switch>
<Route
exact={true}
key="0"
path="/"
render={[Function]}
/>
<Route
exact={false}
key="1"
path="/docs"
render={[Function]}
/>
<Route
component={[Function]}
/>
</Switch>
</div>
</Router>
<withRouter(ScrollToTop)>
<withRouter(AppHeader) />
<Switch>
<Route
exact={true}
key="0"
path="/"
render={[Function]}
/>
<Route
exact={false}
key="1"
path="/docs"
render={[Function]}
/>
<Route
component={[Function]}
/>
</Switch>
</withRouter(ScrollToTop)>
</Router>
</div>
`;
Loading

0 comments on commit 17b85c5

Please sign in to comment.