Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-01-25 00:07:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix/search-field

Browse Source
This commit is contained in:
Fredrik Strand Oseberg 2021-11-24 14:06:26 +01:00 committed by GitHub
commit 3be5181d0e
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/package.json
View File

@ -39,7 +39,7 @@
"@material-ui/core": "4.12.3",
"@material-ui/icons": "4.11.2",
"@material-ui/lab": "4.0.0-alpha.60",
"@testing-library/jest-dom": "5.15.0",
"@testing-library/jest-dom": "5.15.1",
"@testing-library/react": "12.1.2",
"@testing-library/user-event": "13.5.0",
"@types/debounce": "1.2.1",

2
frontend/src/component/menu/Footer/Footer.jsx
View File

@ -11,7 +11,7 @@ export const Footer = () => {
return (
<footer className={styles.footer}>
<Grid container justifyContent="center" spacing={10}>
<Grid container justifyContent="center" spacing={10} style={{marginBottom: 0}}>
<Grid item md={4} xs={12}>
<ShowApiDetailsContainer />
</Grid>

10
frontend/src/component/menu/__tests__/__snapshots__/footer-test.jsx.snap
View File

@ -6,6 +6,11 @@ exports[`should render DrawerMenu 1`] = `
>
<div
className="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-10 MuiGrid-justify-content-xs-center"
style={
Object {
"marginBottom": 0,
}
}
>
<div
className="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-4"
@ -427,6 +432,11 @@ exports[`should render DrawerMenu with "features" selected 1`] = `
>
<div
className="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-10 MuiGrid-justify-content-xs-center"
style={
Object {
"marginBottom": 0,
}
}
>
<div
className="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-4"

8
frontend/yarn.lock
View File

@ -1886,10 +1886,10 @@
lz-string "^1.4.4"
pretty-format "^27.0.2"
"@testing-library/jest-dom@5.15.0":
version "5.15.0"
resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.15.0.tgz#4f5295dbc476a14aec3b07176434b3d51aae5da7"
integrity sha512-lOMuQidnL1tWHLEWIhL6UvSZC1Qt3OkNe1khvi2h6xFiqpe5O8arYs46OU0qyUGq0cSTbroQyMktYNXu3a7sAA==
"@testing-library/jest-dom@5.15.1":
version "5.15.1"
resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.15.1.tgz#4c49ba4d244f235aec53f0a83498daeb4ee06c33"
integrity sha512-kmj8opVDRE1E4GXyLlESsQthCXK7An28dFWxhiMwD7ZUI7ZxA6sjdJRxLerD9Jd8cHX4BDc1jzXaaZKqzlUkvg==
dependencies:
"@babel/runtime" "^7.9.2"
"@types/testing-library__jest-dom" "^5.9.1"