Skip to content

Commit bcd4f54

Browse files
Dhruvi16Dhruvi16
authored
Merge pull request creativecommons#304 from creativecommons/update_footer
Update footer according to the new version of vocabulary
2 parents ca2cb68 + 47ec7d8 commit bcd4f54

File tree

2 files changed

+84
-63
lines changed

2 files changed

+84
-63
lines changed

‎themes/vocabulary_theme/templates/layout.html

Lines changed: 84 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
<div class="navbar-brand">
4646
<a class="has-text-black" href="{{ '/'|url }}">
4747
<svg
48-
class="logo margin-top-big"
49-
xmlns="http://www.w3.org/2000/svg"
50-
preserveAspectRatio="xMidYMid meet"
51-
viewBox="0 0 304 73">
52-
<use href="#opensource"></use>
53-
</svg>
48+
class="logo margin-top-big"
49+
xmlns="http://www.w3.org/2000/svg"
50+
preserveAspectRatio="xMidYMid meet"
51+
viewBox="0 0 304 73">
52+
<use href="#opensource"></use>
53+
</svg>
5454
</a>
5555
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false">
5656
<span aria-hidden="true"></span>
@@ -64,7 +64,8 @@
6464
Blog
6565
</a>
6666
<div class="navbar-item has-dropdown is-hoverable">
67-
<a class="navbar-link is-arrowless {% if this.is_child_of('/contributing-code') %} is-active{% endif%}">Contribute<i class="icon caret-down"></i></a>
67+
<a class="navbar-link is-arrowless {% if this.is_child_of('/contributing-code') %} is-active{% endif%}">
68+
Contribute<i class="icon caret-down"></i></a>
6869
<div class="navbar-dropdown">
6970
{% for href, title in [
7071
['/contributing-code', 'Contribution Guidelines'],
@@ -78,7 +79,8 @@
7879
</div>
7980
</div>
8081
<div class="navbar-item has-dropdown is-hoverable">
81-
<a class="navbar-link is-arrowless {% if this.is_child_of('/community') %} is-active{% endif%}">Community<i class="icon caret-down"></i></a>
82+
<a class="navbar-link is-arrowless {% if this.is_child_of('/community') %} is-active{% endif%}">
83+
Community<i class="icon caret-down"></i></a>
8284
<div class="navbar-dropdown is-active">
8385
{% for href, title in [
8486
['/community', 'Join the Community'],
@@ -95,7 +97,8 @@
9597
</div>
9698
</div>
9799
<div class="navbar-item has-dropdown is-hoverable">
98-
<a class="navbar-link is-arrowless {% if this.is_child_of('/internships') %} is-active{% endif%}">Internships<i class="icon caret-down"></i></a>
100+
<a class="navbar-link is-arrowless {% if this.is_child_of('/internships') %} is-active{% endif%}">
101+
Internships<i class="icon caret-down"></i></a>
99102
<div class="navbar-dropdown">
100103
{% for href, title in [
101104
['/internships', 'Overview'],
@@ -109,17 +112,19 @@
109112
{% endfor %}
110113
</div>
111114
</div>
112-
<a class="navbar-item {% if this.is_child_of('/cc-search') %} is-active{% endif%}" href="{{ '/cc-search'|url }}">
115+
<a class="navbar-item {% if this.is_child_of('/cc-search') %} is-active{% endif%}"
116+
href="{{ '/cc-search'|url }}">
113117
CC Search
114118
</a>
115119
<div class="navbar-item has-dropdown is-hoverable">
116-
<a class="navbar-link is-arrowless {% if this.is_child_of('/archives') %} is-active{% endif%}">Archives<i class="icon caret-down"></i></a>
120+
<a class="navbar-link is-arrowless {% if this.is_child_of('/archives') %} is-active{% endif%}">Archives<i
121+
class="icon caret-down"></i></a>
117122
<div class="navbar-dropdown">
118123
{% for href, title in [
119124
['/archives/old-tech-blog', 'CC Tech Blog (2007-2014)'],
120125
['https://lists.ibiblio.org/pipermail/cc-devel/', 'cc-devel mailing list (2005-2015)'],
121126
] %}
122-
<a class="navbar-item" href="{{ href }}">{{ title }}</a>
127+
<a class="navbar-item" href="{{ href }}">{{ title }}</a>
123128
{% endfor %}
124129
</div>
125130
</div>
@@ -138,21 +143,26 @@ <h1 class="page-title pb-3 mb-4">{% block header %}{{ this.title }}{% endblock %
138143
</div>
139144
</div>
140145
</div>
146+
141147
<footer class="main-footer">
142148
<div class="container">
143149
<div class="columns">
144-
<div class="column">
150+
<div class="column is-one-quarter">
145151
<a href="https://creativecommons.org" class="main-logo margin-bottom-bigger">
146-
<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid meet" viewBox="0 0 304 73"
147-
class=has-text-white>
148-
<use href="#logomark"></use>
149-
</svg>
152+
<span class="has-text-white">
153+
<svg
154+
xmlns="http://www.w3.org/2000/svg"
155+
preserveAspectRatio="xMidYMid meet"
156+
viewBox="0 0 304 73">
157+
<use href="#logomark"></use>
158+
</svg>
159+
</span>
150160
</a>
151-
<p>
161+
<div>
152162
<address class="margin-bottom-normal">Creative Commons<br />PO Box 1866, Mountain View CA 94042</address>
153163
<a href="mailto:info@creativecommons.org" class="mail">info@creativecommons.org</a><br />
154164
<a href="tel://+1-415-429-6753" class="phone">+1-415-429-6753</a>
155-
</p>
165+
</div>
156166
<div class="margin-vertical-large">
157167
<a href="https://www.instagram.com/creativecommons" class="social has-text-white" target="_blank"
158168
rel="noopener">
@@ -172,53 +182,65 @@ <h1 class="page-title pb-3 mb-4">{% block header %}{{ this.title }}{% endblock %
172182
</a>
173183
</div>
174184
</div>
175-
<div class="column is-half">
176-
<nav class="footer-navigation">
177-
<ul class="menu">
178-
<li>
179-
<a href="{{ '/blog'|url }}" class="menu-item">Blog</a>
180-
</li>
181-
<li>
182-
<a href="{{ '/contributing-code'|url }}" class="menu-item">Contributing Guidelines</a>
183-
</li>
184-
<li>
185-
<a href="{{ '/community/community-team'|url }}" class="menu-item">Community Teams</a>
186-
</li>
187-
<li>
188-
<a href="{{ '/contributing-code/projects'|url }}" class="menu-item">Project List</a>
189-
</li>
190-
</ul>
191-
</nav>
192-
<div class="subscription">
193-
<h5 class="b-header">Subscribe to our newsletter</h5>
194-
<form class="newsletter">
195-
<input type="text" class="input" placeholder="Your email">
196-
<input type="submit" value="subscribe" class="button small">
197-
</form>
185+
<div class="column is-three-quarters">
186+
<div class="columns">
187+
<div class="column is-full">
188+
<nav class="footer-navigation">
189+
<ul class="menu">
190+
<li>
191+
<a href="{{ '/blog'|url }}" class="menu-item">Blog</a>
192+
</li>
193+
<li>
194+
<a href="{{ '/contributing-code'|url }}" class="menu-item">Contributing Guidelines</a>
195+
</li>
196+
<li>
197+
<a href="{{ '/community/community-team'|url }}" class="menu-item">Community Teams</a>
198+
</li>
199+
<li>
200+
<a href="{{ '/contributing-code/projects'|url }}" class="menu-item">Project List</a>
201+
</li>
202+
</ul>
203+
</nav>
204+
</div>
198205
</div>
199-
<div class="attribution margin-top-bigger">
200-
<p class="caption">Except where otherwise <a href="https://creativecommons.org/policies#license"
201-
target="_blank">noted</a>, content on this site is licensed under a <a
202-
href="https://creativecommons.org/licenses/by/4.0/" target="_blank">Creative Commons Attribution 4.0
203-
International license</a>. Icons by <a href="https://fontawesome.com/" target="_blank" rel="noopener"
204-
class="has-text-white">Font Awesome</a>.</p>
205-
<div class="margin-top-smaller">
206-
<i class="icon margin-right-small is-size-4">cclogo</i>
207-
<i class="icon margin-right-small is-size-4">ccby</i>
206+
<div class="columns">
207+
<div class="column is-two-thirds">
208+
<div class="subscription">
209+
<h5 class="b-header">Subscribe to our newsletter</h5>
210+
<form class="newsletter">
211+
<input type="text" class="input" placeholder="Your email">
212+
<input type="submit" value="subscribe" class="button small">
213+
</form>
214+
</div>
215+
<div class="attribution margin-top-bigger">
216+
<p class="caption">
217+
Except where otherwise
218+
<a href="https://creativecommons.org/policies#license" target="_blank" rel="noopener">noted</a>,
219+
content on this site is licensed under a
220+
<a href="https://creativecommons.org/licenses/by/4.0/" target="_blank" rel="noopener">Creative Commons
221+
Attribution 4.0 International license</a>.
222+
<a href="https://creativecommons.org/website-icons" target="_blank" rel="noopener">Icons</a>
223+
by
224+
<a href="https://fontawesome.com/" target="_blank" rel="noopener">Font Awesome</a>.
225+
</p>
226+
<div class="margin-top-smaller">
227+
<i class="icon margin-right-small is-size-4">cclogo</i>
228+
<i class="icon margin-right-small is-size-4">ccby</i>
229+
</div>
230+
</div>
231+
</div>
232+
<div class="column is-one-third">
233+
<aside class="donate-section">
234+
<h5>Our work relies on you!</h5>
235+
<p>Help us keep the internet free and open.</p>
236+
<a class="button small donate" href="http://creativecommons.org/donate">
237+
<i class="icon cc-letterheart margin-right-small is-size-5 padding-top-smaller"></i>
238+
Donate now
239+
</a>
240+
</aside>
208241
</div>
209242
</div>
210243
</div>
211-
<div class="column">
212-
<aside class="donate-section">
213-
<h5>Our work relies on you!</h5>
214-
<p>Help us keep the internet free and open.</p>
215-
<a class="button small donate">
216-
<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid meet" viewBox="0 0 80 72">
217-
<use href="#letterheart"></use>
218-
</svg>Donate Now
219-
</a>
220-
</aside>
221-
</div>
222244
</div>
223245
</div>
224246
</footer>

‎webpack/js/main.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $(document).ready(function () {
88
});
99

1010
patchAssetIntoDom('/assets/logos/cc/logomark.svg');
11-
patchAssetIntoDom('/assets/logos/cc/letterheart.svg');
1211
patchAssetIntoDom('/assets/logos/products/open_source.svg');
1312

1413
// Check for click events on the navbar burger icon

0 commit comments

Comments
 (0)