Skip to content

Commit

Permalink
Merge branch 'master' into feat/custom-masthead-logo
Browse files Browse the repository at this point in the history
  • Loading branch information
@kodiakhq
kodiakhq[bot] authored Nov 5, 2020
2 parents 0155bfb + ebb2e4d commit 7ba924b
Show file tree
Hide file tree
Showing 70 changed files with 1,047 additions and 239 deletions.
Binary file removed .yarn/offline-mirror/@babel-runtime-7.10.2.tgz
View file
Binary file not shown.
Binary file added .yarn/offline-mirror/@babel-runtime-7.12.5.tgz
View file
Binary file not shown.
Binary file renamed ...offline-mirror/@carbon-colors-10.14.0.tgz → ...offline-mirror/@carbon-colors-10.15.0.tgz
View file
Binary file not shown.
Binary file removed .yarn/offline-mirror/@carbon-grid-10.15.0.tgz
View file
Binary file not shown.
Binary file added .yarn/offline-mirror/@carbon-grid-10.16.0.tgz
View file
Binary file not shown.
Binary file renamed .../offline-mirror/@carbon-icons-10.19.0.tgz → .../offline-mirror/@carbon-icons-10.20.0.tgz
View file
Binary file not shown.
Binary file renamed ...ne-mirror/@carbon-icons-react-10.19.0.tgz → ...ne-mirror/@carbon-icons-react-10.20.0.tgz
View file
Binary file not shown.
Binary file removed .yarn/offline-mirror/@carbon-layout-10.13.0.tgz
View file
Binary file not shown.
Binary file added .yarn/offline-mirror/@carbon-layout-10.14.0.tgz
View file
Binary file not shown.
Binary file removed .yarn/offline-mirror/@carbon-themes-10.21.0.tgz
View file
Binary file not shown.
Binary file added .yarn/offline-mirror/@carbon-themes-10.22.1.tgz
View file
Binary file not shown.
Binary file removed .yarn/offline-mirror/@carbon-type-10.16.0.tgz
View file
Binary file not shown.
Binary file added .yarn/offline-mirror/@carbon-type-10.17.0.tgz
View file
Binary file not shown.
Binary file removed .yarn/offline-mirror/carbon-components-10.22.0.tgz
View file
Binary file not shown.
Binary file added .yarn/offline-mirror/carbon-components-10.23.2.tgz
View file
Binary file not shown.
Binary file removed .yarn/offline-mirror/carbon-components-react-7.22.0.tgz
View file
Binary file not shown.
Binary file added .yarn/offline-mirror/carbon-components-react-7.23.2.tgz
View file
Binary file not shown.
Binary file added .yarn/offline-mirror/regenerator-runtime-0.13.7.tgz
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions packages/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
"@carbon/ibmdotcom-styles": "1.12.0",
"@carbon/ibmdotcom-utilities": "1.12.0",
"autosuggest-highlight": "^3.1.1",
"carbon-components": "10.22.0",
"carbon-components-react": "7.22.0",
"carbon-components": "10.23.2",
"carbon-components-react": "7.23.2",
"carbon-icons": "7.0.7",
"classnames": "2.2.6",
"react-autosuggest": "^9.4.3",
Expand All @@ -79,7 +79,7 @@
"@babel/preset-env": "^7.5.5",
"@babel/preset-react": "^7.0.0",
"@babel/register": "^7.10.1",
"@carbon/icons-react": "10.19.0",
"@carbon/icons-react": "10.20.0",
"@carbon/pictograms-react": "10.18.0",
"@carbon/storybook-addon-theme": "1.8.0",
"@percy-io/in-percy": "^0.1.11",
Expand Down Expand Up @@ -117,7 +117,7 @@
"babel-plugin-transform-define": "^2.0.0",
"babel-plugin-transform-inline-environment-variables": "^0.4.0",
"browserslist-config-carbon": "10.3.0",
"carbon-components": "10.22.0",
"carbon-components": "10.23.2",
"chalk": "^2.3.0",
"child-process-promise": "^2.2.0",
"chromedriver": "^83.0.0",
Expand Down
39 changes: 0 additions & 39 deletions packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32816,7 +32816,6 @@ exports[`Storyshots Components|Dotcom Shell Default (footer language only) 1`] =
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -32836,13 +32835,11 @@ exports[`Storyshots Components|Dotcom Shell Default (footer language only) 1`] =
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down Expand Up @@ -39633,7 +39630,6 @@ exports[`Storyshots Components|Dotcom Shell Default 1`] = `
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -39653,13 +39649,11 @@ exports[`Storyshots Components|Dotcom Shell Default 1`] = `
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down Expand Up @@ -45447,7 +45441,6 @@ exports[`Storyshots Components|Dotcom Shell Search open 1`] = `
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -45467,13 +45460,11 @@ exports[`Storyshots Components|Dotcom Shell Search open 1`] = `
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down Expand Up @@ -51886,7 +51877,6 @@ exports[`Storyshots Components|Dotcom Shell With L1 1`] = `
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -51906,13 +51896,11 @@ exports[`Storyshots Components|Dotcom Shell With L1 1`] = `
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down Expand Up @@ -59791,7 +59779,6 @@ exports[`Storyshots Components|Dotcom Shell With micro footer (language only) 1`
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -59811,13 +59798,11 @@ exports[`Storyshots Components|Dotcom Shell With micro footer (language only) 1`
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down Expand Up @@ -65630,7 +65615,6 @@ exports[`Storyshots Components|Dotcom Shell With micro footer 1`] = `
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -65650,13 +65634,11 @@ exports[`Storyshots Components|Dotcom Shell With micro footer 1`] = `
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down Expand Up @@ -71200,7 +71182,6 @@ exports[`Storyshots Components|Dotcom Shell With platform 1`] = `
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -71220,13 +71201,11 @@ exports[`Storyshots Components|Dotcom Shell With platform 1`] = `
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down Expand Up @@ -77137,7 +77116,6 @@ exports[`Storyshots Components|Dotcom Shell With short footer (language only) 1`
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -77157,13 +77135,11 @@ exports[`Storyshots Components|Dotcom Shell With short footer (language only) 1`
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down Expand Up @@ -83998,7 +83974,6 @@ exports[`Storyshots Components|Dotcom Shell With short footer 1`] = `
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -84018,13 +83993,11 @@ exports[`Storyshots Components|Dotcom Shell With short footer 1`] = `
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down Expand Up @@ -103367,7 +103340,6 @@ exports[`Storyshots Components|Masthead Default 1`] = `
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -103387,13 +103359,11 @@ exports[`Storyshots Components|Masthead Default 1`] = `
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down Expand Up @@ -104024,7 +103994,6 @@ exports[`Storyshots Components|Masthead Search open by default 1`] = `
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -104044,13 +104013,11 @@ exports[`Storyshots Components|Masthead Search open by default 1`] = `
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down Expand Up @@ -105053,7 +105020,6 @@ exports[`Storyshots Components|Masthead With L 1 1`] = `
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -105073,13 +105039,11 @@ exports[`Storyshots Components|Masthead With L 1 1`] = `
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down Expand Up @@ -107581,7 +107545,6 @@ exports[`Storyshots Components|Masthead With Platform 1`] = `
"width": "3rem",
}
}
tabIndex={0}
>
<ClickListener
onClickOutside={[Function]}
Expand All @@ -107601,13 +107564,11 @@ exports[`Storyshots Components|Masthead With Platform 1`] = `
"width": "3rem",
}
}
tabIndex={0}
type="button"
>
<renderIcon
aria-label="open and close list of options"
className="bx--overflow-menu__icon"
focusable="false"
onClick={[Function]}
onKeyDown={[Function]}
>
Expand Down
9 changes: 5 additions & 4 deletions packages/react/src/components/Footer/README.stories.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,17 @@ function App() {
| `dds--footer-logo` | Component |
| `dds--footer-logo__link` | Interactive |
| `dds--footer-locale-btn` | Interactive |
| `dds--privacy-cp` | Component |
| `dds--legal-nav` | Component |
| `dds--legal-nav__link` | Interactive |
| `dds--locale-modal` | Component |
| `dds--language-selector` | Component |

## Server Side Rendering
## Server-Side Rendering

To server side render the footer, the `Translation` service call needs to be
made to retrieve navigation links. Make sure to pass in the `lc` and `cc` values
as shown in the example below.
For server-side rendering of the footer, the `Translation` service call needs to
be made to retrieve navigation links. Make sure to pass in the `lc` and `cc`
values as shown in the example below.

```javascript
import { TranslationAPI } from '@carbon/ibmdotcom-services';
Expand Down
2 changes: 1 addition & 1 deletion packages/services-store/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"dependencies": {
"@carbon/ibmdotcom-services": "1.12.0",
"@carbon/ibmdotcom-utilities": "1.12.0",
"carbon-components": "10.22.0",
"carbon-components": "10.23.2",
"redux": "^4.0.0",
"redux-logger": "^3.0.0",
"redux-thunk": "^2.3.0"
Expand Down
16 changes: 8 additions & 8 deletions packages/styles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
"visual-snapshot": "yarn build-storybook && percy-storybook --widths=320,1280"
},
"dependencies": {
"@carbon/grid": "10.15.0",
"@carbon/icons-react": "10.19.0",
"@carbon/grid": "10.16.0",
"@carbon/icons-react": "10.20.0",
"@carbon/import-once": "10.3.0",
"@carbon/layout": "10.13.0",
"@carbon/layout": "10.14.0",
"@carbon/motion": "10.9.0",
"@carbon/themes": "10.21.0",
"@carbon/type": "10.16.0",
"carbon-components": "10.22.0"
"@carbon/themes": "10.22.1",
"@carbon/type": "10.17.0",
"carbon-components": "10.23.2"
},
"devDependencies": {
"@babel/core": "^7.7.4",
Expand All @@ -59,8 +59,8 @@
"autoprefixer": "^9.8.0",
"babel-loader": "^8.0.6",
"browserslist-config-carbon": "^10.4.0",
"carbon-components": "10.22.0",
"carbon-components-react": "7.22.0",
"carbon-components": "10.23.2",
"carbon-components-react": "7.23.2",
"del": "^3.0.0",
"fast-sass-loader": "^1.5.0",
"gulp": "^4.0.2",
Expand Down
Loading

0 comments on commit 7ba924b

Please sign in to comment.