Skip to content

Commit 579fd09

Browse files
boneskullboneskull
committed
update copyright & trademark notices per OJSF; closes #4145
- made footer responsive - made matomo & openjsf logos responsive - remove `target="_blank"` since people can decide if they want to open a tab
1 parent 0e1ccbb commit 579fd09

File tree

4 files changed

+160
-38
lines changed

4 files changed

+160
-38
lines changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(The MIT License)
22

3-
Copyright (c) 2011-2018 JS Foundation and contributors, https://js.foundation
3+
Copyright (c) 2011-2020 OpenJS Foundation and contributors, https://openjsf.org
44

55
Permission is hereby granted, free of charge, to any person obtaining
66
a copy of this software and associated documentation files (the

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,6 @@ Finally, come [chat with the maintainers](https://gitter.im/mochajs/contributors
100100

101101
## License
102102

103-
[MIT](LICENSE)
103+
Copyright 2011-2020 OpenJS Foundation and contributors. Licensed [MIT](https://github.com/mochajs/mocha/blob/master/LICENSE).
104104

105105
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fmochajs%2Fmocha.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fmochajs%2Fmocha?ref=badge_large)

‎docs/_includes/default.html

+90-23
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,13 @@ <h1>
3131
<main id="content">{{ content }}</main>
3232

3333
<aside class="sponsorship">
34-
<a href="https://matomo.org/" rel="external noopener" target="_blank">
35-
<img
36-
id="matomoLogo"
37-
src="images/matomo-logo.png?trim"
38-
alt="Matomo logo"
39-
/>
34+
<a href="https://matomo.org/" rel="external noopener">
35+
<img src="images/matomo-logo.png?trim" alt="Matomo logo" />
4036
</a>
4137
<a
4238
title="Mocha is an OpenJS Foundation Project"
4339
href="https://openjsf.org"
4440
rel="external noopener"
45-
target="_blank"
4641
>
4742
<img
4843
src="/images/openjsf-logo.svg"
@@ -54,27 +49,99 @@ <h1>
5449
</aside>
5550

5651
<footer>
57-
<div>
58-
<a rel="home" href="https://mochajs.org/">mochajs.org</a>
59-
is licensed under a
52+
<div id="copyright-notice">
53+
<a rel="home" href="https://mochajs.org/">mochajs.org</a> is licensed
54+
under a
6055
<a
6156
rel="license external noopener"
6257
href="https://creativecommons.org/licenses/by/4.0/"
63-
>
64-
Creative Commons Attribution 4.0 International License</a
58+
>Creative Commons Attribution 4.0 International License</a
6559
>.
66-
<dl class="dl-inline last-modified">
67-
<dt>Last updated</dt>
68-
<dd>
69-
<time
70-
itemprop="lastModified"
71-
datetime="{{ 'now' | date: '%Y-%m-%dT%H:%M:%SZ' }}"
72-
>
73-
{{ 'now' | date: '%a %b %d %H:%M:%S %Y' }}
74-
</time>
75-
</dd>
76-
</dl>
60+
61+
<p>
62+
Copyright
63+
<a href="https://openjsf.org" rel="external noopener"
64+
>OpenJS Foundation</a
65+
>
66+
and Mocha contributors. All rights reserved. The
67+
<a href="https://openjsf.org" rel="external noopener"
68+
>OpenJS Foundation</a
69+
>
70+
has registered trademarks and uses trademarks. For a list of
71+
trademarks of the
72+
<a href="https://openjsf.org" rel="external noopener"
73+
>OpenJS Foundation</a
74+
>, please see our
75+
<a
76+
href="https://trademark-policy.openjsf.org/"
77+
rel="external noopener"
78+
>Trademark Policy</a
79+
>
80+
and
81+
<a href="https://trademark-list.openjsf.org/" rel="external noopener"
82+
>Trademark List</a
83+
>. Trademarks and logos not indicated on the
84+
<a href="https://trademark-list.openjsf.org" rel="external noopener"
85+
>list of OpenJS Foundation trademarks</a
86+
>
87+
are trademarks™ or registered® trademarks of their respective holders.
88+
Use of them does not imply any affiliation with or endorsement by
89+
them.
90+
</p>
7791
</div>
92+
93+
<ul id="openjsf-links">
94+
<li>
95+
<a href="https://openjsf.org/" rel="external noopener"
96+
>The OpenJS Foundation</a
97+
>
98+
</li>
99+
<li>
100+
<a href="https://terms-of-use.openjsf.org/" rel="external noopener"
101+
>Terms of Use</a
102+
>
103+
</li>
104+
<li>
105+
<a href="https://privacy-policy.openjsf.org/" rel="external noopener"
106+
>Privacy Policy</a
107+
>
108+
</li>
109+
<li>
110+
<a href="https://bylaws.openjsf.org/" rel="external noopener"
111+
>OpenJS Foundation Bylaws</a
112+
>
113+
</li>
114+
<li>
115+
<a
116+
href="https://trademark-policy.openjsf.org/"
117+
rel="external noopener"
118+
>Trademark Policy</a
119+
>
120+
</li>
121+
<li>
122+
<a href="https://trademark-list.openjsf.org/" rel="external noopener"
123+
>Trademark List</a
124+
>
125+
</li>
126+
<li>
127+
<a
128+
href="https://www.linuxfoundation.org/cookies/"
129+
rel="external noopener"
130+
>Cookie Policy</a
131+
>
132+
</li>
133+
</ul>
134+
<dl id="last-modified" class="dl-inline">
135+
<dt>Last updated</dt>
136+
<dd>
137+
<time
138+
itemprop="lastModified"
139+
datetime="{{ 'now' | date: '%Y-%m-%dT%H:%M:%SZ' }}"
140+
>
141+
{{ 'now' | date: '%a %b %d %H:%M:%S %Y' }}
142+
</time>
143+
</dd>
144+
</dl>
78145
</footer>
79146
</body>
80147
</html>

‎docs/css/style.css

+68-13
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,17 @@ img.screenshot {
209209
max-width: 100%;
210210
}
211211

212-
#matomoLogo {
212+
.sponsorship a {
213+
display: flex;
214+
justify-content: center;
215+
align-items: center;
216+
}
217+
218+
.sponsorship a img {
213219
display: block;
214-
height: 176px;
220+
object-fit: cover;
221+
width: 100%;
222+
height: 100%;
215223
}
216224

217225
.sponsorship {
@@ -228,18 +236,39 @@ img.screenshot {
228236
footer {
229237
background-color: #eee;
230238
border-top: 1px solid #ddd;
231-
padding: 50px 0;
232-
text-align: right;
233-
}
234-
235-
footer div {
239+
padding: 50px 30px;
236240
color: #888;
237241
font-size: 0.8em;
238-
margin-right: 30px;
239242
}
240243

241-
.last-modified {
244+
#last-modified {
245+
text-align: right;
242246
font-style: italic;
247+
font-size: 0.7em;
248+
}
249+
250+
#copyright-notice {
251+
max-width: 66%;
252+
}
253+
254+
#openjsf-links {
255+
margin: 0;
256+
padding: 0;
257+
box-sizing: initial;
258+
columns: initial;
259+
}
260+
261+
#openjsf-links li {
262+
display: inline; /* displays list horizontally */
263+
border: none;
264+
list-style: none;
265+
margin: initial;
266+
padding: initial;
267+
}
268+
269+
/* displays each list item with a "|" between */
270+
#openjsf-links li + li:before {
271+
content: ' | ';
243272
}
244273

245274
.dl-inline dt,
@@ -257,6 +286,27 @@ footer div {
257286
display: block;
258287
}
259288

289+
blockquote {
290+
border-left: 1px solid #eee;
291+
padding: 10px;
292+
}
293+
294+
@media all and (max-width: 900px) {
295+
#copyright-notice {
296+
max-width: initial;
297+
}
298+
299+
#openjsf-links {
300+
width: 50%;
301+
column-count: 2;
302+
column-rule: 1px solid #dedede;
303+
}
304+
305+
#openjsf-links li + li:before {
306+
content: initial;
307+
}
308+
}
309+
260310
@media all and (max-width: 600px) {
261311
#tag {
262312
margin-top: 0;
@@ -272,9 +322,14 @@ footer div {
272322
margin: 20px -11px;
273323
padding: 10px;
274324
}
275-
}
276325

277-
blockquote {
278-
border-left: 1px solid #eee;
279-
padding: 10px;
326+
/* this list is too long for smaller displays */
327+
#openjsf-links {
328+
width: 100%;
329+
columns: initial;
330+
}
331+
332+
#openjsf-links li {
333+
display: block;
334+
}
280335
}

0 commit comments

Comments
 (0)