Skip to content

Commit a10e050

Browse files
dav1312dav1312
committed
Merge branch 'redesignhomefooter'
2 parents 3ec05f4 + 29284d5 commit a10e050

File tree

13 files changed

+788
-121
lines changed

13 files changed

+788
-121
lines changed

‎assets/scss/components/_footer.scss‎

Lines changed: 17 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,31 @@
11
.footer {
2-
background: $footer-background-color;
2+
color: $footer-text-color;
33
padding-top: 15px;
44
padding-bottom: 15px;
5+
@include media-breakpoint-up(md) {
6+
padding-top: 10px;
7+
padding-bottom: 10px;
8+
}
59
.footer-inner {
610
display: flex;
7-
justify-content: space-between;
811
flex-direction: column;
9-
align-items: flex-start;
10-
@include media-breakpoint-up(sm) {
11-
justify-content: space-between;
12+
justify-content: space-between;
13+
@include media-breakpoint-up(md) {
1214
flex-direction: row;
13-
align-items: center;
1415
}
1516
}
16-
.footer-title {
17-
color: #ffffff;
18-
font-size: 1.3rem;
19-
font-family: $font-family-heading;
20-
font-weight: bold;
21-
margin-bottom: 10px;
22-
@include media-breakpoint-up(sm) {
23-
margin: 0;
17+
.copyright {
18+
font-size: 14px;
19+
align-items: center;
20+
display: flex;
21+
a {
22+
font-weight: bold;
23+
color: inherit;
2424
}
2525
}
26-
ul {
27-
list-style: none;
28-
margin: 0;
29-
padding: 0;
30-
li {
31-
color: $footer-text-color;
32-
font-size: 1rem;
33-
a {
34-
color: $footer-text-color;
35-
text-decoration: none;
36-
padding: 12px 14px 12px 0;
37-
display: block;
38-
&:hover {
39-
text-decoration: underline;
40-
}
41-
}
42-
}
43-
@include media-breakpoint-up(sm) {
44-
height: inherit;
45-
display: flex;
46-
list-style: none;
47-
margin: 0;
48-
padding: 0;
49-
align-items: center;
50-
justify-content: flex-end;
51-
li {
52-
list-style: none;
53-
margin-right: 10px;
54-
&:last-of-type {
55-
margin-right: 0;
56-
}
57-
a {
58-
display: inline-block;
59-
height: 40px;
60-
padding: 10px 8px 10px 8px;
61-
}
62-
}
26+
.social {
27+
a:first-of-type {
28+
margin-left: -10px;
6329
}
6430
}
6531
}

‎assets/scss/components/_horizontal-line.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.horizontal-line {
2+
height: 5px;
3+
width: 80%;
4+
border: 0;
5+
border-bottom: 1px solid $green2;
6+
}

‎assets/scss/components/_intro-image.scss‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22
width: 100%;
33
height: auto;
44
margin-top: -40px;
5+
transition: transform 0.5s;
56
}
7+
8+
.intro-image:hover {
9+
transform: scale(1.05);
10+
transition: transform 0.5s;
11+
}
12+
613
.intro-image-absolute {
714
max-width: none;
815

@@ -27,6 +34,7 @@
2734
width: 850px;
2835
}
2936
}
37+
3038
.intro-image-hide-mobile {
3139
display: none;
3240
@include media-breakpoint-up(md) {

‎assets/scss/components/_intro.scss‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
justify-content: flex-start;
44
align-items: center;
55
padding-top: 60px;
6-
padding-bottom: 60px;
76
overflow: hidden;
87
@include media-breakpoint-up(md) {
98
padding-top: 140px;
10-
padding-bottom: 140px;
119
}
1210
h1 {
1311
font-size: 42px;

‎assets/scss/components/_sub-footer.scss‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎assets/scss/style.scss‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ $font-family-base: -apple-system, BlinkMacSystemFont, "Segoe UI",
2727
$font-family-heading: 'Playfair Display', serif, -apple-system;
2828

2929
// Footer
30-
$footer-background-color: $green4;
31-
$footer-text-color: $white;
32-
$sub-footer-background-color: $green3;
33-
$sub-footer-text-color: $white;
30+
31+
$footer-background-color: $green2;
32+
$footer-text-color: $white-offset;
3433

3534
// Bootstrap
3635
@import 'bootstrap-variables';
@@ -47,7 +46,6 @@ $sub-footer-text-color: $white;
4746
@import 'components/page';
4847
@import 'components/header';
4948
@import 'components/footer';
50-
@import 'components/sub-footer';
5149
@import 'components/logo';
5250
@import 'components/main-menu';
5351
@import 'components/main-menu-mobile';
@@ -60,6 +58,7 @@ $sub-footer-text-color: $white;
6058
@import 'components/strip';
6159
@import 'components/feature';
6260
@import 'components/social';
61+
@import 'components/horizontal-line';
6362

6463
// Pages
6564
@import 'pages/home';
@@ -96,3 +95,19 @@ body:after {
9695
}
9796
}
9897
{{ end }}
98+
99+
.grid {
100+
position: relative;
101+
background-image: url('/images/grid.svg');
102+
min-height: 90vh;
103+
background-size: 500px 500px;
104+
}
105+
.grid::before {
106+
content: "";
107+
position: absolute;
108+
height: 100%;
109+
width: 100%;
110+
bottom: 0;
111+
background: linear-gradient(to bottom, transparent 75%, $green1 100%);
112+
pointer-events: none;
113+
}

‎layouts/_default/baseof.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
</div>
5252

5353
{{ partial "footer.html" . }}
54-
{{ partial "sub-footer.html" . }}
5554

5655
{{ $scripts := resources.Get "js/scripts.js" }}
5756
<!-- dummy to force publishing of windows.json -->

‎layouts/blog/baseof.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
</div>
5555

5656
{{ partial "footer.html" . }}
57-
{{ partial "sub-footer.html" . }}
5857

5958
{{ $scripts := resources.Get "js/scripts.js" }}
6059

‎layouts/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{{ end }}
2323

2424
{{ define "main" }}
25-
<div class="intro">
25+
<div class="intro grid">
2626
<div class="container">
2727
<div class="row justify-content-start">
2828
<div class="col-12 col-md-7 col-lg-6 order-2 order-md-1">
@@ -48,7 +48,7 @@ <h2><a href="/blog/">Latest from the blog</a></h2>
4848

4949

5050
{{if .Site.Data.features}}
51-
<div class="strip strip-green">
51+
<div>
5252
<div class="container pt-6 pb-6 pt-md-10 pb-md-10">
5353
<div class="row justify-content-center">
5454
{{ range .Site.Data.features }}

‎layouts/partials/footer.html‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1+
{{ partial "horizontal-line.html" . }}
2+
13
<div class="footer">
24
<div class="container">
35
<div class="row">
46
<div class="col-12">
57
<div class="footer-inner">
6-
<h3 class="footer-title">{{.Site.Title}}</h3>
7-
<ul>
8-
{{ $currentPage := . }}
9-
{{ range .Site.Menus.footer }}
10-
<li class="menu-item-{{ .Name | lower }}{{ if $currentPage.IsMenuCurrent "main" . }} active{{ end }}">
11-
<a href="{{.URL}}">
12-
{{ .Name }}
13-
</a>
14-
</li>
15-
{{end}}
16-
</ul>
8+
{{ if .Site.Data.social }}
9+
{{ partial "social.html" . }}
10+
{{ end }}
11+
{{ if .Site.Params.footer.copyright_text }}
12+
<div class="copyright">{{ .Site.Params.footer.copyright_text | safeHTML }}</div>
13+
{{ end }}
1714
</div>
1815
</div>
1916
</div>

0 commit comments

Comments
 (0)