From 168504149adb71a956e79362670ed80e23121861 Mon Sep 17 00:00:00 2001 From: Ivan Kordonets Date: Fri, 3 Nov 2023 21:42:39 +0200 Subject: [PATCH 1/2] Resolved merge conflicts. --- package-lock.json | 7 +++++-- package.json | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index b503902d1..1f28d9895 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "d3-zoom": "^3.0.0", "flux": "~4.0.1", "fs-extra": "^10.0.0", - "fsevents": "^2.3.2", + "fsevents": "^2.3.3", "gapi-script": "github:wevote/gapi-script", "glob": "^7.1.6", "iframe-resizer-react": "^1.1.0", @@ -10166,6 +10166,7 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, "hasInstallScript": true, "os": [ "darwin" @@ -29793,7 +29794,9 @@ "fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==" + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "optional": true }, "fstream": { "version": "1.0.12", diff --git a/package.json b/package.json index 580fcc0db..513c81eeb 100644 --- a/package.json +++ b/package.json @@ -112,6 +112,7 @@ "d3-zoom": "^3.0.0", "flux": "~4.0.1", "fs-extra": "^10.0.0", + "fsevents": "^2.3.3", "gapi-script": "github:wevote/gapi-script", "glob": "^7.1.6", "iframe-resizer-react": "^1.1.0", From 6ea1abd0c0aabca333a03265b8a80b4c07e1ce27 Mon Sep 17 00:00:00 2001 From: Ivan Kordonets Date: Fri, 3 Nov 2023 22:17:43 +0200 Subject: [PATCH 2/2] fix css for candidate --- .../components/Widgets/OfficeNameText.jsx | 1 + src/js/components/Ballot/CandidateItem.jsx | 43 ++++++++++--------- .../BallotItemSupportOpposeComment.jsx | 2 +- .../Widgets/ItemActionBar/ItemActionBar.jsx | 2 + .../Widgets/PositionPublicToggle.jsx | 7 ++- .../Widgets/TwitterAccountStats.jsx | 4 +- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/src/js/common/components/Widgets/OfficeNameText.jsx b/src/js/common/components/Widgets/OfficeNameText.jsx index b27f15c5a..faca49543 100644 --- a/src/js/common/components/Widgets/OfficeNameText.jsx +++ b/src/js/common/components/Widgets/OfficeNameText.jsx @@ -143,6 +143,7 @@ const PartyAndYearWrapper = styled('span')` const PartyAndOfficeWrapper = styled('div')` line-height: 1.2; + font-size: 14px; `; const YearStateWrapper = styled('div', { diff --git a/src/js/components/Ballot/CandidateItem.jsx b/src/js/components/Ballot/CandidateItem.jsx index cddae13e2..8ce9d980d 100644 --- a/src/js/components/Ballot/CandidateItem.jsx +++ b/src/js/components/Ballot/CandidateItem.jsx @@ -368,6 +368,28 @@ class CandidateItem extends Component { <> {candidateNameRow} + + }> + + + + { contestOfficeName && (
- - }> - - -
); diff --git a/src/js/components/Widgets/BallotItemSupportOpposeComment.jsx b/src/js/components/Widgets/BallotItemSupportOpposeComment.jsx index 4b2abecc4..efcbd216e 100644 --- a/src/js/components/Widgets/BallotItemSupportOpposeComment.jsx +++ b/src/js/components/Widgets/BallotItemSupportOpposeComment.jsx @@ -272,7 +272,7 @@ const ActionBarWrapper = styled('div', { shouldForwardProp: (prop) => !['isCrunched'].includes(prop), })(({ isCrunched }) => (` padding: 0; - margin-bottom: ${isCrunched ? '3px' : '12px'}; + margin-bottom: ${isCrunched ? '3px' : '2px'}; `)); const CommentDisplayWrapper = styled('div', { diff --git a/src/js/components/Widgets/ItemActionBar/ItemActionBar.jsx b/src/js/components/Widgets/ItemActionBar/ItemActionBar.jsx index ebb012511..0d2e28e5b 100644 --- a/src/js/components/Widgets/ItemActionBar/ItemActionBar.jsx +++ b/src/js/components/Widgets/ItemActionBar/ItemActionBar.jsx @@ -1021,8 +1021,10 @@ const ButtonGroup = styled('div', { // border-width: 1 px; flex-wrap: nowrap; height: fit-content; + height: 40px; justify-content: center; margin-left: 0; + margin-right: 8px; ${positionPublicToggleWrapAllowed ? 'width: 100%;' : ''}; `)); diff --git a/src/js/components/Widgets/PositionPublicToggle.jsx b/src/js/components/Widgets/PositionPublicToggle.jsx index 66465a57a..273d985b5 100644 --- a/src/js/components/Widgets/PositionPublicToggle.jsx +++ b/src/js/components/Widgets/PositionPublicToggle.jsx @@ -287,7 +287,7 @@ PositionPublicToggle.propTypes = { const styles = (theme) => ({ radioPrimary: { padding: '.1rem', - margin: '.1rem .1rem .6rem .6rem', + marginRight: '4px', [theme.breakpoints.down('md')]: { marginLeft: 0, }, @@ -297,7 +297,7 @@ const styles = (theme) => ({ // bottom: '4px', position: 'relative', [theme.breakpoints.down('sm')]: { - fontSize: '11px', + fontSize: '13px', }, marginRight: isAndroidSizeMD() ? '2px' : '', }, @@ -309,6 +309,7 @@ const styles = (theme) => ({ const PositionPublicToggleOuterWrapper = styled('div')` // margin-left: auto; width: fit-content; + //padding-top: 12px; `; const PositionPublicToggleInnerWrapper = styled('div')(({ theme }) => (` @@ -326,6 +327,7 @@ const RadioItem = styled('div', { // width: 100% !important; // min-width: 100% !important; // margin-bottom: -6px; + padding-right: 6px; `) : ''} `)); @@ -335,6 +337,7 @@ const RadioGroup = styled('div', { display: flex; flex-flow: row nowrap; width: 100%; + height: 40px; ${theme.breakpoints.down('md')} { margin-bottom: -10px; } diff --git a/src/js/components/Widgets/TwitterAccountStats.jsx b/src/js/components/Widgets/TwitterAccountStats.jsx index a42140a54..09bbf6f09 100644 --- a/src/js/components/Widgets/TwitterAccountStats.jsx +++ b/src/js/components/Widgets/TwitterAccountStats.jsx @@ -78,14 +78,14 @@ const TwitterAccountStatsOuterWrapper = styled('div')` const TwitterFollowersWrapper = styled('div')` color: #000; - font-size: 16px; + font-size: 14px; height: 24px; padding: 0 !important; `; const TwitterHandleWrapper = styled('div')` color: #000; - font-size: 16px; + font-size: 14px; height: 24px; margin-right: 5px; padding: 0 !important;