Skip to content

Commit 6d8f9f6

Browse files
Dhruvi16Dhruvi16
committed
Update footer according to the new version of vocabulary
1 parent d7ac2aa commit 6d8f9f6

File tree

4 files changed

+85
-71
lines changed

4 files changed

+85
-71
lines changed

‎themes/vocabulary_theme/templates/layout.html

+81-66
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,10 @@
4444
<nav class="navbar">
4545
<div class="navbar-brand">
4646
<a class="has-text-black" href="{{ '/'|url }}">
47-
<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>
47+
<svg class="logo margin-top-big" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid meet"
48+
viewBox="0 0 304 73">
49+
<use href="#opensource"></use>
50+
</svg>
5451
</a>
5552
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false">
5653
<span aria-hidden="true"></span>
@@ -64,7 +61,8 @@
6461
Blog
6562
</a>
6663
<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>
64+
<a class="navbar-link is-arrowless {% if this.is_child_of('/contributing-code') %} is-active{% endif%}">Contribute<i
65+
class="icon caret-down"></i></a>
6866
<div class="navbar-dropdown">
6967
{% for href, title in [
7068
['/contributing-code', 'Contribution Guidelines'],
@@ -73,12 +71,13 @@
7371
['/contributing-code/github-repo-guidelines', 'GitHub Repo Guidelines'],
7472
['/contributing-code/cc-search', 'CC Search'],
7573
] %}
76-
<a class="navbar-item" href="{{ href|url }}">{{ title }}</a>
74+
<a class="navbar-item" href="{{ href|url }}">{{ title }}</a>
7775
{% endfor %}
7876
</div>
7977
</div>
8078
<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>
79+
<a class="navbar-link is-arrowless {% if this.is_child_of('/community') %} is-active{% endif%}">Community<i
80+
class="icon caret-down"></i></a>
8281
<div class="navbar-dropdown is-active">
8382
{% for href, title in [
8483
['/community', 'Join the Community'],
@@ -90,12 +89,13 @@
9089
['/community/code-of-conduct', 'Code of Conduct'],
9190
['/community/code-of-conduct/enforcement', 'Code of Conduct Enforcement'],
9291
] %}
93-
<a class="navbar-item" href="{{ href|url }}">{{ title }}</a>
92+
<a class="navbar-item" href="{{ href|url }}">{{ title }}</a>
9493
{% endfor %}
9594
</div>
9695
</div>
9796
<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>
97+
<a class="navbar-link is-arrowless {% if this.is_child_of('/internships') %} is-active{% endif%}">Internships<i
98+
class="icon caret-down"></i></a>
9999
<div class="navbar-dropdown">
100100
{% for href, title in [
101101
['/internships', 'Overview'],
@@ -105,21 +105,23 @@
105105
['/internships/mentor-guide', 'Mentor Guide'],
106106
['/internships/history', 'History'],
107107
] %}
108-
<a class="navbar-item" href="{{ href|url }}">{{ title }}</a>
108+
<a class="navbar-item" href="{{ href|url }}">{{ title }}</a>
109109
{% endfor %}
110110
</div>
111111
</div>
112-
<a class="navbar-item {% if this.is_child_of('/cc-search') %} is-active{% endif%}" href="{{ '/cc-search'|url }}">
112+
<a class="navbar-item {% if this.is_child_of('/cc-search') %} is-active{% endif%}"
113+
href="{{ '/cc-search'|url }}">
113114
CC Search
114115
</a>
115116
<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>
117+
<a class="navbar-link is-arrowless {% if this.is_child_of('/archives') %} is-active{% endif%}">Archives<i
118+
class="icon caret-down"></i></a>
117119
<div class="navbar-dropdown">
118120
{% for href, title in [
119121
['/archives/old-tech-blog', 'CC Tech Blog (2007-2014)'],
120122
['https://lists.ibiblio.org/pipermail/cc-devel/', 'cc-devel mailing list (2005-2015)'],
121123
] %}
122-
<a class="navbar-item" href="{{ href }}">{{ title }}</a>
124+
<a class="navbar-item" href="{{ href }}">{{ title }}</a>
123125
{% endfor %}
124126
</div>
125127
</div>
@@ -138,21 +140,22 @@ <h1 class="page-title pb-3 mb-4">{% block header %}{{ this.title }}{% endblock %
138140
</div>
139141
</div>
140142
</div>
143+
141144
<footer class="main-footer">
142145
<div class="container">
143146
<div class="columns">
144-
<div class="column">
147+
<div class="column is-one-quarter">
145148
<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>
149+
<span class="has-text-white"><svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid meet"
150+
viewBox="0 0 304 73">
151+
<use href="#logomark"></use>
152+
</svg></span>
150153
</a>
151-
<p>
154+
<div>
152155
<address class="margin-bottom-normal">Creative Commons<br />PO Box 1866, Mountain View CA 94042</address>
153156
<a href="mailto:info@creativecommons.org" class="mail">info@creativecommons.org</a><br />
154157
<a href="tel://+1-415-429-6753" class="phone">+1-415-429-6753</a>
155-
</p>
158+
</div>
156159
<div class="margin-vertical-large">
157160
<a href="https://www.instagram.com/creativecommons" class="social has-text-white" target="_blank"
158161
rel="noopener">
@@ -172,53 +175,65 @@ <h1 class="page-title pb-3 mb-4">{% block header %}{{ this.title }}{% endblock %
172175
</a>
173176
</div>
174177
</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>
178+
<div class="column is-three-quarters">
179+
<div class="columns">
180+
<div class="column is-full">
181+
<nav class="footer-navigation">
182+
<ul class="menu">
183+
<li>
184+
<a href="{{ '/blog'|url }}" class="menu-item">Blog</a>
185+
</li>
186+
<li>
187+
<a href="{{ '/contributing-code'|url }}" class="menu-item">Contributing Guidelines</a>
188+
</li>
189+
<li>
190+
<a href="{{ '/community/community-team'|url }}" class="menu-item">Community Teams</a>
191+
</li>
192+
<li>
193+
<a href="{{ '/contributing-code/projects'|url }}" class="menu-item">Project List</a>
194+
</li>
195+
</ul>
196+
</nav>
197+
</div>
198198
</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>
199+
<div class="columns">
200+
<div class="column is-two-thirds">
201+
<div class="subscription">
202+
<h5 class="b-header">Subscribe to our newsletter</h5>
203+
<form class="newsletter">
204+
<input type="text" class="input" placeholder="Your email">
205+
<input type="submit" value="subscribe" class="button small">
206+
</form>
207+
</div>
208+
<div class="attribution margin-top-bigger">
209+
<p class="caption">
210+
Except where otherwise
211+
<a href="https://creativecommons.org/policies#license" target="_blank" rel="noopener">noted</a>,
212+
content on this site is licensed under a
213+
<a href="https://creativecommons.org/licenses/by/4.0/" target="_blank" rel="noopener">Creative Commons
214+
Attribution 4.0 International license</a>.
215+
<a href="https://creativecommons.org/website-icons" target="_blank" rel="noopener">Icons</a>
216+
by
217+
<a href="https://fontawesome.com/" target="_blank" rel="noopener">Font Awesome</a>.
218+
</p>
219+
<div class="margin-top-smaller">
220+
<i class="icon margin-right-small is-size-4">cclogo</i>
221+
<i class="icon margin-right-small is-size-4">ccby</i>
222+
</div>
223+
</div>
224+
</div>
225+
<div class="column is-one-third">
226+
<aside class="donate-section">
227+
<h5>Our work relies on you!</h5>
228+
<p>Help us keep the internet free and open.</p>
229+
<a class="button small donate" href="http://creativecommons.org/donate">
230+
<i class="icon cc-letterheart margin-right-small is-size-5 padding-top-smaller"></i>
231+
Donate now
232+
</a>
233+
</aside>
208234
</div>
209235
</div>
210236
</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>
222237
</div>
223238
</div>
224239
</footer>

‎webpack/js/main.js

-1
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

‎webpack/package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎webpack/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"license": "MIT",
1010
"devDependencies": {
1111
"@babel/core": "^7.9.0",
12-
"@creativecommons/vocabulary": "^1.0.0-beta.15",
12+
"@creativecommons/vocabulary": "^1.0.0-beta.16",
1313
"autoprefixer": "^9.7.5",
1414
"babel-loader": "^8.1.0",
1515
"css-loader": "^2.1.1",

0 commit comments

Comments
 (0)