Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restyle Privacy Policy and About page; Reset global headings and list styles #793

Merged
merged 8 commits into from
Apr 8, 2021
Merged

Restyle Privacy Policy and About page; Reset global headings and list styles #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ba5ac0b
Update styling on Privacy Policy Page to match Terms and Conditions p…
nclairesays Apr 7, 2021
39092e1
Fix NavBar style due to resetting of global list styling #789 #790
nclairesays Apr 7, 2021
c468399
Update About page and TermsAndConditions so that app style is more un…
nclairesays Apr 7, 2021
35def90
Update usages of headings in calculation pages to have no margin, due…
nclairesays Apr 7, 2021
191f7db
Fix centering of Public Comment page title #790
nclairesays Apr 7, 2021
2d75021
Update global h1 to be a little smaller #790
nclairesays Apr 7, 2021
c6cd4a1
Fix console warning ul cannot be descendant of p #789
nclairesays Apr 7, 2021
0a23f51
Merge branch 'develop' into 789-restyle-privacy-policy
entrotech Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 10 additions & 24 deletions client/src/components/About.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,8 @@ import { version } from "../../package.json";
import ContentContainer from "./Layout/ContentContainer";

const useStyles = createUseStyles({
aboutText: {
maxWidth: "500px",
minWidth: 300,
padding: "0 2em"
},
aboutHeader: {
marginTop: "0.5em",
marginBottom: "1em",
textAlign: "start",
fontSize: "20px",
fontWeight: "normal",
fontStyle: "normal"
},
"@media (max-width: 768px)": {
aboutText: {
padding: "0"
}
aboutContent: {
maxWidth: "1000px"
},
linklist: {
marginBottom: "0.8em"
Expand All @@ -33,15 +18,14 @@ const About = () => {
return (
<ContentContainer componentToTrack="AboutPage">
<h1>About the TDM Calculator</h1>
<br />
<div className={classes.aboutText}>
<h3 className={classes.aboutHeader}>What does TDM mean?</h3>
<div className={classes.aboutContent}>
<h3>What does TDM mean?</h3>
<p>
Transportation Demand Management (TDM) refers to the strategies a city
uses to influence travel behavior and accommodate growing demands on
its transportation system.
</p>
<h3 className={classes.aboutHeader}>TDM Program Update</h3>
<h3>TDM Program Update</h3>
<p>
Los Angeles Department of Transportation (LADOT) and Los Angeles City
Planning (LACP) are working together to update the City’s TDM
Expand All @@ -50,7 +34,7 @@ const About = () => {
and reduce single-occupancy vehicle trips, which benefits the
environment, public health, and can ease congestion.
</p>
<h3 className={classes.aboutHeader}>What is the TDM Calculator?</h3>
<h3>What is the TDM Calculator?</h3>
<p>
The TDM Calculator is a tool developed to help simplify the
development and implementation of the proposed updates to the City’s
Expand All @@ -72,14 +56,16 @@ const About = () => {
<p>
Learn more about <a href="http://www.hackforla.org">Hack for LA</a>
</p>
<h3 className={classes.aboutHeader}>Status of the TDM Calculator</h3>
<h3>Status of the TDM Calculator</h3>

<p>
The TDM Calculator is in a beta phase and is still undergoing testing
and development. A public use version of the TDM Calculator will be
developed after the updated TDM ordinance is approved by the City
Council and Mayor.{" "}
</p>
<h3 className={classes.aboutHeader}>Additional Resources</h3>
<h3>Additional Resources</h3>

<ul>
<li className={classes.linklist}>
<a href="https://planning.lacity.org/plans-policies/initiatives-policies/mobility">
Expand Down
3 changes: 2 additions & 1 deletion client/src/components/NavBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ const useStyles = createUseStyles({
flexGrow: "1",
flexShrink: "0",
flexBasis: "content",
marginLeft: "2em",
margin: "0 0 0 2em",
padding: "0",
display: "flex",
flexDirection: "row",
justifyContent: "flex-start",
Expand Down
Loading