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

Standardize Events Page - Update header section #1213

Merged
merged 7 commits into from
Mar 22, 2021
Merged

Standardize Events Page - Update header section #1213

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bbdd076
Standardize Events Page - Update header section
kevinreber Mar 17, 2021
214d98d
Updated donation gif on Join Us page
kevinreber Mar 19, 2021
cc6fab3
Merge branch '1254-Join-Us-Update-donation-gif' of https://github.com…
kevinreber Mar 21, 2021
844add7
Merge branch 'kevinreber-1254-Join-Us-Update-donation-gif' into gh-pages
kevinreber Mar 21, 2021
de9b9e7
Merge branch 'upstream-gh-pages' into gh-pages
kevinreber Mar 21, 2021
8f7cc16
Merge branch '1110-Standardize-Events-Page-header-section' of https:/…
kevinreber Mar 21, 2021
6af1eac
Merge branch 'kevinreber-1110-Standardize-Events-Page-header-section'…
kevinreber Mar 21, 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
19 changes: 12 additions & 7 deletions _sass/components/_events.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,24 @@
}
}

.hacknights--header-container {
padding: 6rem 6rem 5rem 8rem;
.header-container--events {
padding: .2rem 4rem 5.5rem 4rem;
}

.hacknights--head-content {
.events--head-content {
margin: 2% 0 0% 4%;
text-align: initial;
}

.header-text-margin--events{
max-width: 520px;
margin: 0;
}

.header-desc {
text-align: initial;
font-weight: 530;
font-size: 25px;
line-height: 29px;
font-size: 1.125rem;
margin: 2% 0 20px 5%;

@media #{$bp-below-tablet} {
Expand All @@ -44,6 +48,7 @@
flex-direction: row-reverse;
margin-left: 40px;
margin-bottom: -7%;
justify-content: center;
@media #{$bp-below-tablet} {
flex-direction: row-reverse;
flex-grow: 6;
Expand Down Expand Up @@ -493,7 +498,7 @@
/* These styles are for the mobile view of the events page */

@media #{$bp-below-desktop} {
.hacknights--header-container {
.header-container--events {
padding: 2rem 2rem 2rem 2rem;
}

Expand All @@ -515,7 +520,7 @@
}

.fullscreen-video {
width: 100%;
margin-right: 5rem;
}

.events-video-fullscreen-container {
Expand Down
2 changes: 1 addition & 1 deletion events/events.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
permalink: /events/
---

<div class="header-container hacknights--header-container">
<div class="header-container header-container--events">
{% include_relative header-container-content.html %}
</div>

Expand Down
6 changes: 3 additions & 3 deletions events/header-container-content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h1>Events</h1>
<div class="content-hack-night">
<div class="show-video">
<div>
<div class="header-text-margin--events">
<h1>Events</h1>
<h2 class="header-desc">
Hack for LA is the Los Angeles brigade of
<a href="http://brigade.codeforamerica.org/" target="_blank">Code for America</a>,
Expand All @@ -17,7 +17,7 @@ <h2 class="header-desc">
</div>
</div>

<p id="head-content" class="hacknights--head-content">
<p id="head-content" class="events--head-content">
To learn more, watch the
<a href="https://www.ted.com/talks/jennifer_pahlka_coding_a_better_government" target="_blank">Ted Talk</a>
by Code for America founder, Jennifer Pahlka, on maintaining a better government through code.
Expand Down