ddfridley
commented
4 years ago Can you git checkout master git pull git checkout this-branch git merge master git push origin this-branch
That should make it all up to date unless there are conflicts to resolve
d.
Get BlueMail for Android
On Aug 13, 2020, 5:30 PM, at 5:30 PM, MrNanosh notifications@github.com wrote:
closes #238
Should merge master to branch preambleRedesign#210 first. notice that the branch is labeled with the incorrect issue number. This is the initial redesign implementation based on design specs by @tianchili11 . The goal is to improve the conversion rate of candidates taking the first step to record. You can view, comment on, or merge this pull request online at:
https://github.com/EnCiv/undebate/pull/248
-- Commit Summary --
- added scorecard to menu as Rank the Candidates but did not at the asset yet
- changed location of preamble in candidate-conversation to preambleRedesign and copied the old preamble into and refactored it so that it was a functional component and that to use updated jss createUseStyles syntax
- spun Questions for candidates out into its own component called Agenda;
- drafted another component to hold steps section
- drafted the Preamble Header in another component and used OrangeButton to make Start Recording Button
- pulled out the preamble by a react portal and added scroll to the preamble inner
- adjusted typography of major text as well as other sizes
- updated LibreFranklin link in head tag in server-react-render to have more fontWeights
- adjusted font size of Welcome sign and Start Recording Button
- typography for one screensize finished
- added the last two steps (content)
- commented out font at root of candidate-preamble in index.js
- added a check for document before attempting to use document.gettElementById to create a portal
- made some adjustments to prevent reference error to document
- loading preamble outside of portal by default
- added flag image and icons from cloudinary size refinement and other improvements to come
- added bottom padding to icons in steps
- added margin between divs
- changed the quality of banner image
- used the flex holy albatross to deal with the resizing of steps
- used the flex holy albatross to deal with the resizing of steps
- changed content of header slug and moved recording is Easy outside into the preamble-inner-content section and adjusted the styles to make it have equal spacing above and below
- changed tips content and styling to allow a ul instead of a p tag and added a maximum width of 1000px for inner preamble content
- edited Orange button to fix bug that wasnt allowing onClick to work
-- File Changes --
M app/components/OrangeButton.js (2) D app/components/candidate-preamble.jsx (196) A app/components/candidate-preamble/Agenda.js (117) A app/components/candidate-preamble/PreambleHeader.js (57) A app/components/candidate-preamble/StartRecordingButton.js (30) A app/components/candidate-preamble/Steps.js (104) A app/components/candidate-preamble/index.js (158) M app/components/conversation-header.jsx (3) D app/components/preamble.jsx (105) A app/components/preamble/index.js (103) M app/components/web-components/HartfordVotes/HartfordLandingMenu.js (6) M app/server/routes/server-react-render.jsx (2)
-- Patch Links --
https://github.com/EnCiv/undebate/pull/248.patch https://github.com/EnCiv/undebate/pull/248.diff
-- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/EnCiv/undebate/pull/248
MrNanosh
closes #238
Should merge master to branch preambleRedesign#210 first. notice that the branch is labeled with the incorrect issue number. This is the initial redesign implementation based on design specs by @tianchili11 . The goal is to improve the conversion rate of candidates taking the first step to record.