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.

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

Complete refactor/standardization of all buttons within Home Page #3422

Merged
merged 1 commit into from
Jul 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions _includes/donate-button.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="header-links">
<ul class="inline-list header-list">
<ul class="inline-list header-list">
<li>
<a href="/donate/" target="_blank" ><button class="btn btn-dark btn-md-narrow btn--donate-header">Donate</button></a>
<a href="/donate/" class="btn btn-dark btn-md-narrow btn--donate-header" title="Go to Donate Page">Donate</a>
</li>
</ul>
</div>
2 changes: 1 addition & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="footer-contain">
<nav class="footer-nav">
<div class="header-links">
<a href="/donate/" target="_blank"><button class="btn btn-primary-on-dark btn-md-narrow btn--donate-footer">Donate</button></a>
<a href="/donate/" class="btn btn-primary-on-dark btn-md-narrow btn--donate-footer btn--default" title="Go to Donate Page">Donate</a>
<div class="footer-links">
<div class="credits-page"><a href="/credits">Credits</a>&nbsp;|&nbsp;<a href="/sitemap">Site Map</a>&nbsp;|&nbsp;<a href="/join">Join Us</a></div>
<ul class="inline-list header-list">
Expand Down
13 changes: 6 additions & 7 deletions _includes/forms/contact-us.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@
<section class="content-section">
<!-- <h2 class="page-contain">Get in Touch</h2><br> -->

<div class="page-card card-secondary page-card-md page-card--home page-card--home-volunteer">
<div class="page-card card-secondary page-card-md-VWU page-card--home page-card--home-volunteer">
<h3 class="title3">Volunteer with us</h3>
<div class="row-1">
<div class="column volunteerWithUs">
<p>We are looking for volunteers of all different skill types, levels, and civic interests.</p>
<a href='./getting-started'><button class='btn btn-primary btn--home-survey'>Getting Started</button></a><br>
<a href='/getting-started' class='btn btn-primary btn--home-survey btn--default'>Getting Started</a><br>
</div>
<div class="column volunteerWithUs">
<p>Please help us understand your transportation preferences by completing a short survey.</p>
<a href='https://docs.google.com/forms/d/e/1FAIpQLSeb5zITlv_OewbT_k0UMNw6kail8-vKIyjM3E9qPMLYR6qiYw/viewform'><button
class='btn btn-primary btn--home-survey'>Transportation</button></a>
<a href='https://docs.google.com/forms/d/e/1FAIpQLSeb5zITlv_OewbT_k0UMNw6kail8-vKIyjM3E9qPMLYR6qiYw/viewform' class='btn btn-primary btn--home-survey btn--default' target='_blank' title='Hack for LA Transportation Survey'>Transportation</a>
</div>
</div>
</div><br>
Expand All @@ -22,17 +21,17 @@ <h3 class="title3">Get in touch with us</h3>
<p>The more you tell us about yourself, the better we can match you with the right resources.</p><br>

<div class="row">
<div class="column"><a href='./survey4'><button class='btn btn-primary btn--home-survey'>Government</button></a></div>
<div class="column"><a href='/survey4' target='_blank' class='btn btn-primary btn--home-survey btn--default' title='Government Contact Form'>Government</a></div>
<div class="column">I am a government agency.</div>
</div><br>

<div class="row">
<div class="column"><a href='./survey3'><button class='btn btn-primary btn--home-survey'>Non-profit</button></a></div>
<div class="column"><a href='/survey3' target='_blank' class='btn btn-primary btn--home-survey btn--default' title='Non-profit Contact Form'>Non-profit</a></div>
<div class="column">I am a non-profit organization.</div>
</div><br>

<div class="row">
<div class="column"><a href='./survey6'><button class='btn btn-primary btn--home-survey'>Other</button></a></div>
<div class="column"><a href='/survey6' class='btn btn-primary btn--home-survey btn--default' target='_blank' title='General Contact Form'>Other</a></div>
<div class="column">I am none of the above.</div>
</div><br>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _includes/home-getting-started.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class='home-getting-started-container content-section section-hack-nights'>
<a href='./join'><button class='btn btn-primary btn-xl-long btn--home-getting-started'>Join Us</button></a>
<a href='/join' class='btn btn-primary btn-xl-long btn--home-getting-started btn--default'>Join Us</a>
</div>
2 changes: 1 addition & 1 deletion _sass/components/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}

.btn--donate-footer {
display: block;
display: table;
margin: 0 auto;

@media #{$bp-mobile-up} {
Expand Down
14 changes: 7 additions & 7 deletions _sass/components/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,26 @@
flex-grow: 1;
text-align: right;

li {
margin-right: 20px;
/*li {
margin-right: 20px;

&:last-child {
margin-right: 0;
margin-right: 0;
}
}

a {
&:link,
&:visited {
color: $color-black;
margin: -4px;
margin: -4px;
}

&:hover,
&:active,
&:focus {
color: $color-red;
}
}
}*/
}

.branding {
Expand All @@ -70,7 +69,7 @@
}

.btn--donate-header {
margin: -10px 20px 0 0;
margin: -10px 16.25px 0 0;
}

@media only screen and (max-width: 1028px) {
Expand Down Expand Up @@ -102,6 +101,7 @@
font-weight: 500;
height: 30px;
margin-top: 6px;
padding-top: 15px;
line-height: 0;
}
}
7 changes: 6 additions & 1 deletion _sass/components/_home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -418,13 +418,18 @@ button {
}

.column {
display: flex;
display: block;
flex-direction: column;
flex: 1;
}

.volunteerWithUs {
margin: 0 5%;
padding-bottom: 40px;

@media #{$bp-below-tablet} {
padding-bottom: 20px;
}
}

.row-1 {
Expand Down
10 changes: 10 additions & 0 deletions _sass/elements/_cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,16 @@
padding: 20px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.25);
}

// Special class for Getting Started and Transportation btns. Medium but without the padding
.page-card-md-VWU {
max-width: 800px;
margin: 0 auto;
padding-top: 20px;
padding-left: 20px;
padding-right: 20px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.25);
}


/*----------------------------------------------------
Expand Down