Skip to content

Commit 17c0142

Browse files
committed
Merge branch 'release-0.2.3' into main
2 parents 1962a40 + bdf003c commit 17c0142

File tree

6 files changed

+34
-11
lines changed

6 files changed

+34
-11
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
### 0.3.1 (2023-01-19)
6+
7+
- add contact-us email address to the footer
8+
59
### 0.3.0
610

711
- Add GoogleAnalytics tag

app/assets/stylesheets/components/_nav.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@
133133

134134
.nav__li {
135135
margin: 0 rem-calc(14);
136-
137136
display: inline;
138137

139138
&:first-child {
@@ -162,4 +161,10 @@
162161
margin-right: rem-calc(30);
163162
margin-bottom: rem-calc(8);
164163
}
164+
165165
}
166+
167+
.nav__contact-us {
168+
@include nav-basic;
169+
text-transform: none;
170+
}

app/helpers/application_helper.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ def footer_nav
1111
navPresenter.nav_footer
1212
end
1313

14+
def contact_email
15+
navPresenter = NavigationPresenter.new
16+
17+
navPresenter.contact_us
18+
end
19+
1420
def footer_icons; end
1521

1622
def site_logos

app/presenters/navigation_presenter.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,8 @@ def nav_footer
5555
}
5656
]
5757
end
58+
59+
def contact_us
60+
'CONTACT US: nature.commitments@unep-wcmc.org'
61+
end
5862
end

app/views/layouts/application.html.erb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
<% else %>
3131
<%= render partial:'partials/global/footer', locals: {
3232
links: footer_nav,
33-
logos: site_logos
33+
logos: site_logos,
34+
email: contact_email
3435
} %>
3536
<% end %>
3637
</div>

app/views/partials/global/_footer.html.erb

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<footer class="footer">
22
<div class="footer__container">
3-
<nav class="nav--footer">
4-
<ul class="nav__ul">
5-
<% links.each do |link| %>
6-
<li class="nav__li">
7-
<%= link_to link[:title], link[:url], class: 'nav__a' %>
8-
</li>
9-
<% end %>
10-
</ul>
11-
</nav>
3+
<div>
4+
<nav class="nav--footer">
5+
<ul class="nav__ul">
6+
<% links.each do |link| %>
7+
<li class="nav__li">
8+
<%= link_to link[:title], link[:url], class: 'nav__a' %>
9+
</li>
10+
<% end %>
11+
</ul>
12+
</nav>
13+
<a class="nav__contact-us"><%= email %></a>
14+
</div>
1215

1316
<div class="list--footer-logos">
1417
<ul class="list__ul">

0 commit comments

Comments
 (0)