Skip to content

Commit 99f57d0

Browse files
Dhruvi16Dhruvi16
committed
Resolve conflicts
2 parents 86cdfcd + bcd4f54 commit 99f57d0

File tree

3 files changed

+95
-63
lines changed

3 files changed

+95
-63
lines changed

‎themes/vocabulary_theme/templates/layout.html

+88-62
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@
4747
<div class="navbar-brand">
4848
<a class="has-text-black" href="{{ '/'|url }}">
4949
<svg
50-
class="logo margin-top-big"
51-
xmlns="http://www.w3.org/2000/svg"
52-
preserveAspectRatio="xMidYMid meet"
53-
viewBox="0 0 304 73">
54-
<use href="#opensource"></use>
55-
</svg>
50+
class="logo margin-top-big"
51+
xmlns="http://www.w3.org/2000/svg"
52+
preserveAspectRatio="xMidYMid meet"
53+
viewBox="0 0 304 73">
54+
<use href="#opensource"></use>
55+
</svg>
5656
</a>
5757
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false">
5858
<span aria-hidden="true"></span>
@@ -66,7 +66,8 @@
6666
Blog
6767
</a>
6868
<div class="navbar-item has-dropdown is-hoverable">
69-
<a class="navbar-link is-arrowless {% if this.is_child_of('/contributing-code') %} is-active{% endif%}">Contribute<i class="icon caret-down"></i></a>
69+
<a class="navbar-link is-arrowless {% if this.is_child_of('/contributing-code') %} is-active{% endif%}">
70+
Contribute<i class="icon caret-down"></i></a>
7071
<div class="navbar-dropdown">
7172
{% for href, title in [
7273
['/contributing-code', 'Contribution Guidelines'],
@@ -80,7 +81,8 @@
8081
</div>
8182
</div>
8283
<div class="navbar-item has-dropdown is-hoverable">
83-
<a class="navbar-link is-arrowless {% if this.is_child_of('/community') %} is-active{% endif%}">Community<i class="icon caret-down"></i></a>
84+
<a class="navbar-link is-arrowless {% if this.is_child_of('/community') %} is-active{% endif%}">
85+
Community<i class="icon caret-down"></i></a>
8486
<div class="navbar-dropdown is-active">
8587
{% for href, title in [
8688
['/community', 'Join the Community'],
@@ -97,7 +99,8 @@
9799
</div>
98100
</div>
99101
<div class="navbar-item has-dropdown is-hoverable">
100-
<a class="navbar-link is-arrowless {% if this.is_child_of('/internships') %} is-active{% endif%}">Internships<i class="icon caret-down"></i></a>
102+
<a class="navbar-link is-arrowless {% if this.is_child_of('/internships') %} is-active{% endif%}">
103+
Internships<i class="icon caret-down"></i></a>
101104
<div class="navbar-dropdown">
102105
{% for href, title in [
103106
['/internships', 'Overview'],
@@ -111,17 +114,19 @@
111114
{% endfor %}
112115
</div>
113116
</div>
114-
<a class="navbar-item {% if this.is_child_of('/cc-search') %} is-active{% endif%}" href="{{ '/cc-search'|url }}">
117+
<a class="navbar-item {% if this.is_child_of('/cc-search') %} is-active{% endif%}"
118+
href="{{ '/cc-search'|url }}">
115119
CC Search
116120
</a>
117121
<div class="navbar-item has-dropdown is-hoverable">
118-
<a class="navbar-link is-arrowless {% if this.is_child_of('/archives') %} is-active{% endif%}">Archives<i class="icon caret-down"></i></a>
122+
<a class="navbar-link is-arrowless {% if this.is_child_of('/archives') %} is-active{% endif%}">Archives<i
123+
class="icon caret-down"></i></a>
119124
<div class="navbar-dropdown">
120125
{% for href, title in [
121126
['/archives/old-tech-blog', 'CC Tech Blog (2007-2014)'],
122127
['https://lists.ibiblio.org/pipermail/cc-devel/', 'cc-devel mailing list (2005-2015)'],
123128
] %}
124-
<a class="navbar-item" href="{{ href }}">{{ title }}</a>
129+
<a class="navbar-item" href="{{ href }}">{{ title }}</a>
125130
{% endfor %}
126131
</div>
127132
</div>
@@ -167,27 +172,36 @@
167172
</ul>
168173
</nav>
169174
</div>
175+
<<<<<<< HEAD
170176
{% endif %}
171177

172178
<!-- Body -->
173179
{% block body %}{% endblock %}
174180

175181
<!-- Footer -->
182+
=======
183+
</div>
184+
185+
>>>>>>> bcd4f549329a5712d949d18fe9e317b18c2ac1a9
176186
<footer class="main-footer">
177187
<div class="container">
178188
<div class="columns">
179-
<div class="column">
189+
<div class="column is-one-quarter">
180190
<a href="https://creativecommons.org" class="main-logo margin-bottom-bigger">
181-
<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid meet" viewBox="0 0 304 73"
182-
class=has-text-white>
183-
<use href="#logomark"></use>
184-
</svg>
191+
<span class="has-text-white">
192+
<svg
193+
xmlns="http://www.w3.org/2000/svg"
194+
preserveAspectRatio="xMidYMid meet"
195+
viewBox="0 0 304 73">
196+
<use href="#logomark"></use>
197+
</svg>
198+
</span>
185199
</a>
186-
<p>
200+
<div>
187201
<address class="margin-bottom-normal">Creative Commons<br />PO Box 1866, Mountain View CA 94042</address>
188202
<a href="mailto:info@creativecommons.org" class="mail">info@creativecommons.org</a><br />
189203
<a href="tel://+1-415-429-6753" class="phone">+1-415-429-6753</a>
190-
</p>
204+
</div>
191205
<div class="margin-vertical-large">
192206
<a href="https://www.instagram.com/creativecommons" class="social has-text-white" target="_blank"
193207
rel="noopener">
@@ -207,53 +221,65 @@
207221
</a>
208222
</div>
209223
</div>
210-
<div class="column is-half">
211-
<nav class="footer-navigation">
212-
<ul class="menu">
213-
<li>
214-
<a href="{{ '/blog'|url }}" class="menu-item">Blog</a>
215-
</li>
216-
<li>
217-
<a href="{{ '/contributing-code'|url }}" class="menu-item">Contributing Guidelines</a>
218-
</li>
219-
<li>
220-
<a href="{{ '/community/community-team'|url }}" class="menu-item">Community Teams</a>
221-
</li>
222-
<li>
223-
<a href="{{ '/contributing-code/projects'|url }}" class="menu-item">Project List</a>
224-
</li>
225-
</ul>
226-
</nav>
227-
<div class="subscription">
228-
<h5 class="b-header">Subscribe to our newsletter</h5>
229-
<form class="newsletter">
230-
<input type="text" class="input" placeholder="Your email">
231-
<input type="submit" value="subscribe" class="button small">
232-
</form>
224+
<div class="column is-three-quarters">
225+
<div class="columns">
226+
<div class="column is-full">
227+
<nav class="footer-navigation">
228+
<ul class="menu">
229+
<li>
230+
<a href="{{ '/blog'|url }}" class="menu-item">Blog</a>
231+
</li>
232+
<li>
233+
<a href="{{ '/contributing-code'|url }}" class="menu-item">Contributing Guidelines</a>
234+
</li>
235+
<li>
236+
<a href="{{ '/community/community-team'|url }}" class="menu-item">Community Teams</a>
237+
</li>
238+
<li>
239+
<a href="{{ '/contributing-code/projects'|url }}" class="menu-item">Project List</a>
240+
</li>
241+
</ul>
242+
</nav>
243+
</div>
233244
</div>
234-
<div class="attribution margin-top-bigger">
235-
<p class="caption">Except where otherwise <a href="https://creativecommons.org/policies#license"
236-
target="_blank">noted</a>, content on this site is licensed under a <a
237-
href="https://creativecommons.org/licenses/by/4.0/" target="_blank">Creative Commons Attribution 4.0
238-
International license</a>. Icons by <a href="https://fontawesome.com/" target="_blank" rel="noopener"
239-
class="has-text-white">Font Awesome</a>.</p>
240-
<div class="margin-top-smaller">
241-
<i class="icon margin-right-small is-size-4">cclogo</i>
242-
<i class="icon margin-right-small is-size-4">ccby</i>
245+
<div class="columns">
246+
<div class="column is-two-thirds">
247+
<div class="subscription">
248+
<h5 class="b-header">Subscribe to our newsletter</h5>
249+
<form class="newsletter">
250+
<input type="text" class="input" placeholder="Your email">
251+
<input type="submit" value="subscribe" class="button small">
252+
</form>
253+
</div>
254+
<div class="attribution margin-top-bigger">
255+
<p class="caption">
256+
Except where otherwise
257+
<a href="https://creativecommons.org/policies#license" target="_blank" rel="noopener">noted</a>,
258+
content on this site is licensed under a
259+
<a href="https://creativecommons.org/licenses/by/4.0/" target="_blank" rel="noopener">Creative Commons
260+
Attribution 4.0 International license</a>.
261+
<a href="https://creativecommons.org/website-icons" target="_blank" rel="noopener">Icons</a>
262+
by
263+
<a href="https://fontawesome.com/" target="_blank" rel="noopener">Font Awesome</a>.
264+
</p>
265+
<div class="margin-top-smaller">
266+
<i class="icon margin-right-small is-size-4">cclogo</i>
267+
<i class="icon margin-right-small is-size-4">ccby</i>
268+
</div>
269+
</div>
270+
</div>
271+
<div class="column is-one-third">
272+
<aside class="donate-section">
273+
<h5>Our work relies on you!</h5>
274+
<p>Help us keep the internet free and open.</p>
275+
<a class="button small donate" href="http://creativecommons.org/donate">
276+
<i class="icon cc-letterheart margin-right-small is-size-5 padding-top-smaller"></i>
277+
Donate now
278+
</a>
279+
</aside>
243280
</div>
244281
</div>
245282
</div>
246-
<div class="column">
247-
<aside class="donate-section">
248-
<h5>Our work relies on you!</h5>
249-
<p>Help us keep the internet free and open.</p>
250-
<a class="button small donate">
251-
<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid meet" viewBox="0 0 80 72">
252-
<use href="#letterheart"></use>
253-
</svg>Donate Now
254-
</a>
255-
</aside>
256-
</div>
257283
</div>
258284
</div>
259285
</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/sass/main.scss

+7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
@import "../node_modules/@creativecommons/vocabulary/scss/color.scss";
44
@import "../node_modules/@creativecommons/vocabulary/scss/typography.scss";
55

6+
// links
7+
a {
8+
@extend .has-color-forest-green;
9+
10+
text-decoration: none;
11+
}
12+
613
.navbar-item {
714
&.has-dropdown {
815
.navbar-dropdown {

0 commit comments

Comments
 (0)