Skip to content

Standardize events page 1125 #1377

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

Merged
akibrhast merged 6 commits into from
Apr 10, 2021
Merged

Standardize events page 1125 #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
39e0e00
banner to full width + spacing on side images
erikaBell Apr 8, 2021
3bab54a
removed my comments
erikaBell Apr 8, 2021
5ddd36b
added missing e in class name
erikaBell Apr 8, 2021
c5f0a4b
variable name added
erikaBell Apr 8, 2021
3505795
all scss color variable friendly now
erikaBell Apr 8, 2021
235b0a0
added that pesky semicolon
erikaBell Apr 10, 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
26 changes: 17 additions & 9 deletions _sass/components/_events.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
content: "\226A";
float: left;
transition: transform 0.25s ease-in;
color: #000000;
color: $color-black;
font-weight: normal;
font-size: 18px;
margin: 0 6px;
Expand All @@ -134,8 +134,17 @@
max-width: 150px;
}

.fullwidth-background-container {
background-color: $color-gold;
margin: 0 -2em;
}
.add-padding-container {
padding: 0 2.5em;
}

.getting-started-mobile-page {
@media #{$bp-below-mobile} {
pading: 0 2em;
display: inline;
margin: 20px;
border: 0 solid rgba(51, 51, 51, 0.06);
Expand Down Expand Up @@ -200,7 +209,7 @@
}

.notification-banner {
background-color: #f2c94d;
background-color: $color-gold;
width: 100%;
display: flex;
justify-content: center;
Expand All @@ -219,9 +228,8 @@
font-weight: 700;

@media #{$bp-below-mobile} {
text-align: justify;
padding: 12px;
margin: 0;
padding: 1em 2em;
font-size: 16px;
line-height: 19px;
}
Expand Down Expand Up @@ -383,7 +391,7 @@
float: right;
transform: rotate(-45deg);
transition: transform 0.25s ease-in;
color: #fa114f;
color: $color-red;
font-weight: bolder;
font-size: 24px;
}
Expand Down Expand Up @@ -416,7 +424,7 @@
float: right;
transform: rotate(-45deg);
transition: transform 0.25s ease-in;
color: #fa114f;
color: $color-red;
font-weight: bolder;
font-size: 24px;
}
Expand Down Expand Up @@ -444,7 +452,7 @@
.mobile-locations-dropdown {
@media #{$bp-below-tablet} {
display: none;
background: #f2c94d;
background: $color-gold;
}
}

Expand Down Expand Up @@ -538,7 +546,7 @@



.events-page{
.events-page, .content-section{
background: $color-blue-dark;
min-height: 100vh;
display: flex;
Expand All @@ -555,7 +563,7 @@
}

.events-page-header {
color: #ffffff;
color: $color-white;
margin-top: 48px;
font-size: 36px;
}
1 change: 1 addition & 0 deletions _sass/variables/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ $color-pink: #f7f5f5;
$color-dodgerblue: #1587FF;
$color-lightseagreen: #0DC583;
$color-orange: #F9B400;
$color-gold: #F2C94D;
$color-chocolate: #F16618;
$color-firebrick: #D7261B;
$color-deeppink: #FA207C;
Expand Down
28 changes: 16 additions & 12 deletions pages/events/events.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{% include_relative header-container-content.html %}
</div>

<section class="events-page">
<section class="events-page content-section">

<h1 class = "events-page-header">Our Events</h1>
<div class="flex-page-card">
Expand All @@ -25,18 +25,22 @@ <h1 class = "events-page-header">
Our Locations
</h1>

<div class="notification-banner">
<p class="meetings-message">
In light of the COVID-19 pandemic, Hack for LA has suspended its in-person
events below. The organization remains fully active, and all events are
now being conducted remotely using Zoom at the days/times listed above.
</p>
<div class="fullwidth-background-container">
<div class="notification-banner">
<p class="meetings-message">
In light of the COVID-19 pandemic, Hack for LA has suspended its in-person
events below. The organization remains fully active, and all events are
now being conducted remotely using Zoom at the days/times listed above.
</p>
</div>

<div class="getting-started-mobile-page">
<h2 class="event-title-1">
<img class="vector-img" src="../assets/images/hack-nights/locations.svg" alt="image of a location icon" />
See our Locations
</h2>
<div class="add-padding-container">
<div class="getting-started-mobile-page">
<h2 class="event-title-1">
<img class="vector-img" src="../assets/images/hack-nights/locations.svg" alt="image of a location icon" />
See our Locations
</h2>
</div>
</div>
</div>

Expand Down