Skip to content

Commit 1ded47f

Browse files
Merge branch 'add_content_to_about_page'
2 parents d37c3c5 + 6e2e287 commit 1ded47f

15 files changed

+38
-11
lines changed

_pages/01_about.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
../static/images/events_page/events_page_top_1650x1100px.jpg 1650w"
1717
media="(orientation: portrait)"
1818
sizes="100vw">
19-
<img class=""
19+
<img class="about__background-img"
2020
src="../static/images/events_page/events_page_top_960x300px.jpg"
2121
alt="Events">
2222
</picture>

_pages/03_events.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
permalink: /events/
55
---
66
<section class="events-page">
7-
<div class="events-page__background-img-container" data-image-type="responsive">
7+
<div class="events-page__background-img-container">
88
<picture>
99
<source srcset="../static/images/events_page/events_page_top_480x150px.jpg 480w,
1010
../static/images/events_page/events_page_top_960x300px.jpg 960w,
@@ -15,10 +15,9 @@
1515
../static/images/events_page/events_page_top_1650x1100px.jpg 1650w"
1616
media="(orientation: portrait)"
1717
sizes="100vw">
18-
<img class=""
18+
<img class="events-page__background-img"
1919
src="../static/images/events_page/events_page_top_960x300px.jpg"
20-
alt="Events"
21-
data-overlay="linear-gradient(180deg, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.65) 100%)">
20+
alt="Events">
2221
</picture>
2322
<div class="events-page__title-container row container-fluid">
2423
<div class="col-sm-12">

_pages/04_contact.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
permalink: /contact/
55
---
66
<section class="contact">
7-
<div class="contact__background-img-container" data-image-type="responsive">
7+
<div class="contact__background-img-container">
88
<picture>
99
<source srcset="../static/images/contact/contact_top_450x150px.jpg 450w,
1010
../static/images/contact/contact_top_960x300px.jpg 960w,
@@ -15,10 +15,9 @@
1515
../static/images/contact/contact_top_1650x1100px.jpg 1650w"
1616
media="(orientation: portrait)"
1717
sizes="100vw">
18-
<img class=""
18+
<img class="contact__background-img"
1919
src="../static/images/contact/contact_top_960x300px.jpg"
20-
alt="Contact Us"
21-
data-overlay="linear-gradient(180deg, rgba(0, 0, 0, 0.75) 0%, rgba(0, 0, 0, 0.75) 100%)">
20+
alt="Contact Us">
2221
</picture>
2322
<div class="contact__page-title-container row container-fluid">
2423
<div class="col-sm-12">

_sass/about.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
}
1010
}
1111

12+
.about__background-img {
13+
@extend .page__background-img;
14+
}
15+
1216
.about__page-title-container {
1317
@extend .page__title-container;
1418
}

_sass/contact.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
}
1010
}
1111

12+
.contact__background-img {
13+
@extend .page__background-img;
14+
}
15+
1216
.contact__page-title-container {
1317
@extend .page__title-container;
1418
}

_sass/events.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
border-top-right-radius: 5px;
4949
}
5050

51+
.events-page__background-img {
52+
@extend .page__background-img;
53+
}
54+
5155
.events-page__event-col {
5256
@extend .post__event-col;
5357
border-bottom-left-radius: 5px;

_sass/style.scss

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ a {
4141
.page__background-img-container {
4242
position: relative;
4343
&::after {
44+
width: 100vw;
4445
content: "";
4546
position: absolute;
4647
top: 0;
@@ -50,6 +51,12 @@ a {
5051
}
5152
}
5253

54+
@media (orientation: landscape){
55+
.page__background-img {
56+
min-height: 250px;
57+
}
58+
}
59+
5360
.page__title-container {
5461
z-index: 2;
5562
position: absolute;
@@ -85,6 +92,7 @@ a {
8592

8693
/*Here I need to move the background image to slide under the navigation*/
8794
/*Any smarter solutions are welcome!*/
95+
8896
.navigation__content {
8997
@extend .page__background-img-container;
9098
margin-top: -66px;
@@ -93,12 +101,21 @@ a {
93101
}
94102
}
95103

104+
.navigation__background-img {
105+
height: calc(100vh + 2px);
106+
width: 100%;
107+
}
108+
96109
.navigation__brand {
110+
position: relative;
97111
background-color: rgba(0, 0, 0, 0.2);
98112
border: rgba(0, 0, 0, 0.2) 1px solid;
99113
border-radius: 6px;
100114
}
101115

116+
.navigation__brand-link {
117+
}
118+
102119
.navigation__brand-name {
103120
font-size: 0.8em;
104121
color: $brand-name;

_sass/typography.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115

116116
.event-label {
117117
font-family: 'Encode Sans Expanded', sans-serif;
118-
background: linear-gradient(45deg, $grey, $grey 80%, transparent 80%, transparent 100%);
118+
background-image: linear-gradient(45deg, $grey, $grey 80%, transparent 80%, transparent 100%);
119119
font-size: 1.25em;
120120
text-align: left;
121121
color: $title-dark;

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
static/images/title_photo/title_glass_building_1442x2562.jpg 1442w"
2020
media="(orientation: portrait)"
2121
sizes="100vw">
22-
<img class=""
22+
<img class="navigation__background-img"
2323
src="static/images/title_photo/title_glass_building_960x540.jpg"
2424
alt="Python Sprints Title Image">
2525
</picture>
222 KB
Loading

0 commit comments

Comments
 (0)