diff --git a/package-lock.json b/package-lock.json index a2e9cfd85..6813458e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,11 +13,11 @@ "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", "@loadable/component": "^5.16.4", - "@mui/icons-material": "^5.15.20", + "@mui/icons-material": "^5.16.0", "@mui/lab": "^5.0.0-alpha.96", - "@mui/material": "^5.15.20", + "@mui/material": "^5.16.0", "@mui/styled-engine-sc": "^5.10.1", - "@mui/styles": "^5.15.20", + "@mui/styles": "^5.16.0", "@openreplay/tracker": "^8.1.1", "@storybook/addon-actions": "^7.6.20", "@stripe/react-stripe-js": "^1.3.0", @@ -3198,10 +3198,9 @@ } }, "node_modules/@mui/icons-material": { - "version": "5.15.20", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.20.tgz", - "integrity": "sha512-oGcKmCuHaYbAAoLN67WKSXtHmEgyWcJToT1uRtmPyxMj9N5uqwc/mRtEnst4Wj/eGr+zYH2FiZQ79v9k7kSk1Q==", - "license": "MIT", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.16.0.tgz", + "integrity": "sha512-6ISoOhkp9w5gD0PEW9JklrcbyARDkFWNTBdwXZ1Oy5IGlyu9B0zG0hnUIe4H17IaF1Vgj6C8VI+v4tkSdK0veg==", "dependencies": { "@babel/runtime": "^7.23.9" }, @@ -3272,17 +3271,16 @@ } }, "node_modules/@mui/material": { - "version": "5.15.20", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.15.20.tgz", - "integrity": "sha512-tVq3l4qoXx/NxUgIx/x3lZiPn/5xDbdTE8VrLczNpfblLYZzlrbxA7kb9mI8NoBF6+w9WE9IrxWnKK5KlPI2bg==", - "license": "MIT", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.16.0.tgz", + "integrity": "sha512-DbR1NckTLpjt9Zut9EGQ70th86HfN0BYQgyYro6aXQrNfjzSwe3BJS1AyBQ5mJ7TdL6YVRqohfukxj9JlqZZUg==", "dependencies": { "@babel/runtime": "^7.23.9", "@mui/base": "5.0.0-beta.40", - "@mui/core-downloads-tracker": "^5.15.20", - "@mui/system": "^5.15.20", + "@mui/core-downloads-tracker": "^5.16.0", + "@mui/system": "^5.16.0", "@mui/types": "^7.2.14", - "@mui/utils": "^5.15.20", + "@mui/utils": "^5.16.0", "@types/react-transition-group": "^4.4.10", "clsx": "^2.1.0", "csstype": "^3.1.3", @@ -3441,16 +3439,15 @@ } }, "node_modules/@mui/styles": { - "version": "5.15.20", - "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.15.20.tgz", - "integrity": "sha512-zpXYhNxQ9A4zxF3IRQRZRUg7fXYj6Wfa3nB+7yOLVecokhjCAr1zY2VC5Uznf5qs2cfgBRfmDkBYqvQjHWf2uA==", - "license": "MIT", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.16.0.tgz", + "integrity": "sha512-d/Hd1FJuIzAmX89sNazRcnFBGZLb8klPG9E+AshhVpWZcoV/9Ar29On2XS0IxRh7Y5GoA0oTDkU0jivKWjzkiw==", "dependencies": { "@babel/runtime": "^7.23.9", "@emotion/hash": "^0.9.1", - "@mui/private-theming": "^5.15.20", + "@mui/private-theming": "^5.16.0", "@mui/types": "^7.2.14", - "@mui/utils": "^5.15.20", + "@mui/utils": "^5.16.0", "clsx": "^2.1.0", "csstype": "^3.1.3", "hoist-non-react-statics": "^3.3.2", diff --git a/package.json b/package.json index e6c00bc3f..1de4db75e 100644 --- a/package.json +++ b/package.json @@ -110,11 +110,11 @@ "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", "@loadable/component": "^5.16.4", - "@mui/icons-material": "^5.15.20", + "@mui/icons-material": "^5.16.0", "@mui/lab": "^5.0.0-alpha.96", - "@mui/material": "^5.15.20", + "@mui/material": "^5.16.0", "@mui/styled-engine-sc": "^5.10.1", - "@mui/styles": "^5.15.20", + "@mui/styles": "^5.16.0", "@openreplay/tracker": "^8.1.1", "@storybook/addon-actions": "^7.6.20", "@stripe/react-stripe-js": "^1.3.0", diff --git a/src/js/components/Ballot/BallotElectionListWithFilters.jsx b/src/js/components/Ballot/BallotElectionListWithFilters.jsx index cd6535543..d6320eb20 100644 --- a/src/js/components/Ballot/BallotElectionListWithFilters.jsx +++ b/src/js/components/Ballot/BallotElectionListWithFilters.jsx @@ -786,9 +786,12 @@ const ElectionState = styled('div')` margin: 0 2px; `; -const SimpleModeItemWrapper = styled('div')` +const SimpleModeItemWrapper = styled('button')` cursor: pointer; margin-top: 12px; + padding: 0; + background: transparent; + border: none; `; const PriorOrUpcomingElectionsWrapper = styled('div')` diff --git a/src/js/components/Navigation/FooterMainWeVote.jsx b/src/js/components/Navigation/FooterMainWeVote.jsx index 3f6ba2e97..01a4db65d 100644 --- a/src/js/components/Navigation/FooterMainWeVote.jsx +++ b/src/js/components/Navigation/FooterMainWeVote.jsx @@ -84,7 +84,7 @@ class FooterMainWeVote extends Component { -
How It Works
+ - + The fine print: diff --git a/src/js/components/Ready/ReadyIntroduction.jsx b/src/js/components/Ready/ReadyIntroduction.jsx index 7aa169fd6..faa59cced 100644 --- a/src/js/components/Ready/ReadyIntroduction.jsx +++ b/src/js/components/Ready/ReadyIntroduction.jsx @@ -34,6 +34,7 @@ class ReadyIntroduction extends Component { this.state = { contentUnfurled: false, }; + this.firstListItemRef = React.createRef(); } componentDidMount () { @@ -65,6 +66,9 @@ class ReadyIntroduction extends Component { this.setState({ contentUnfurled: !contentUnfurled, }); + if (!contentUnfurled) { + this.firstListItemRef.current.focus(); + } } showSelectBallotModalEditAddress = () => { @@ -91,7 +95,7 @@ class ReadyIntroduction extends Component { return ( - + WeVote helps you: @@ -104,9 +108,9 @@ class ReadyIntroduction extends Component {   - - Enter your address - + {' '} to find out when your next election is, and {' '} diff --git a/src/js/components/Widgets/ShowMoreButtons.jsx b/src/js/components/Widgets/ShowMoreButtons.jsx index 13013fd73..f825dc83d 100644 --- a/src/js/components/Widgets/ShowMoreButtons.jsx +++ b/src/js/components/Widgets/ShowMoreButtons.jsx @@ -57,7 +57,7 @@ const styles = (theme) => ({ }, }); -const ShowMoreButtonsStyled = styled('div')(({ theme }) => (` +const ShowMoreButtonsStyled = styled('button')(({ theme }) => (` border: 0 !important; color: #0858A1; cursor: pointer; diff --git a/src/js/pages/Ready.jsx b/src/js/pages/Ready.jsx index 3ccac5d95..b3742e27c 100644 --- a/src/js/pages/Ready.jsx +++ b/src/js/pages/Ready.jsx @@ -266,11 +266,6 @@ class Ready extends Component { )} - {nextReleaseFeaturesEnabled && ( - - )}
{(chosenReadyIntroductionTitle || chosenReadyIntroductionText) && ( @@ -293,6 +288,11 @@ class Ready extends Component { {/* nextReleaseFeaturesEnabled && */}
+ {nextReleaseFeaturesEnabled && ( + + )}