Skip to content

Commit bb3915a

Browse files
authored
Merge pull request #295 from ember-learn/footer-issues
Implement the new design for the Footer
2 parents 1b0e015 + 1371909 commit bb3915a

File tree

5 files changed

+38
-19
lines changed

5 files changed

+38
-19
lines changed

addon/styles/components/es-footer.css

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,19 @@
2020
}
2121

2222
& .footer-info {
23+
padding-bottom: var(--spacing-5);
24+
padding-top: var(--spacing-5);
2325
display: flex;
2426
justify-content: space-between;
2527

26-
& .logo-wrapper {
27-
grid-row: 1 / 4;
28+
& .spacer {
29+
grid-row: 2 / 4;
30+
}
31+
32+
& .info-link {
33+
margin-top: auto;
34+
margin-bottom: auto;
35+
line-height: 40px;
2836
}
2937
}
3038

@@ -58,22 +66,28 @@
5866

5967
& .footer-statement {
6068
justify-content: space-between;
61-
background-color: var(--color-gray-100);
6269
}
6370

6471
& .footer-copyright {
6572
color: var(--color-gray-600);
6673
}
6774

68-
& .footer-contributions-wrapper {
69-
background-color: var(--color-white);
75+
& .footer-spacer {
76+
border: 0;
77+
border-top: 2px solid var(--color-gray-300);
78+
display: block;
79+
height: 2px;
7080
}
7181

7282
& .footer-contributions {
7383
align-items: center;
7484
color: var(--color-gray-600);
7585
display: flex;
7686
justify-content: space-between;
87+
88+
& .sponsor-icons {
89+
margin-top: var(--spacing-1);
90+
}
7791
}
7892

7993
& .footer-contributor-logo,
@@ -85,30 +99,31 @@
8599

86100
@media (max-width: 1007px) {
87101
& .footer-info {
102+
padding-bottom: var(--spacing-3);
103+
padding-top: var(--spacing-3);
88104
flex-direction: column;
89105

90106
& .footer-logo {
91-
margin-bottom: var(--spacing-1);
92107
width: 5rem;
93108
}
94109
}
95110

96111
& .footer-info-links {
97-
display: flex;
112+
display: block;
98113
flex-wrap: wrap;
99114

100115
& > a {
101116
margin-right: var(--spacing-2);
102117
}
103-
104-
& .logo-wrapper {
105-
width: 100%;
106-
}
107118
}
108119

109120
& .footer-contributions {
110121
align-items: start;
111122
flex-direction: column;
123+
124+
& .sponsor-icons {
125+
margin-top: var(--spacing-2);
126+
}
112127
}
113128
}
114129
}

addon/templates/components/es-footer.hbs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77

88
<EsFooter::EsStatement @tagline={{tagline}} />
99

10+
<hr class="footer-spacer container py-0 my-3">
11+
1012
<EsFooter::EsContributions @contributorLinks={{contributorLinks}} />
1113
</footer>

addon/templates/components/es-footer/es-contributions.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<div class="footer-contributions-wrapper container py-3">
1+
<div class="footer-contributions-wrapper container pt-0 pb-3">
22
<div class="footer-contributions">
33
<span>Ember is generously supported by</span>
4-
<div class="mt-1">
4+
<div class="sponsor-icons">
55
{{#each args.contributorLinks as |link|}}
66
<a href={{link.href}} title={{link.title}} aria-label={{link.title}} class="mr-2">
77
{{svg-jar link.class class="footer-contributor-logo"}}

addon/templates/components/es-footer/es-info.hbs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
<div class="footer-info container py-2 text-sm">
1+
<div class="footer-info container">
22
<div class="footer-info-links">
3-
<div class="logo-wrapper">
4-
<img src="/images/ember-logo.svg" alt="Ember Logo" class="footer-logo">
5-
</div>
3+
4+
<img src="/images/ember-logo.svg" height="40px" width="83px" alt="Ember Logo" class="footer-logo">
5+
6+
<div class="spacer"></div>
7+
68
{{#each args.infoLinks as |link|}}
7-
<a href={{link.href}}>{{link.name}}</a>
9+
<a href={{link.href}} class="info-link">{{link.name}}</a>
810
{{/each}}
911
</div>
1012
<div class="footer-social hide-on-mobile">

addon/templates/components/es-footer/es-statement.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="footer-statement">
2-
<p class="footer-copyright container py-3">
2+
<p class="footer-copyright container py-1">
33
&copy; Copyright {{currentYear}} - <a href="https://www.tilde.io/" class="footer-copyright">Tilde Inc.</a>
44
<br>
55
{{args.tagline}}

0 commit comments

Comments
 (0)