Skip to content

Commit ec6cde2

Browse files
Merge pull request #557 from creativecommons/semantic-results
correct `h1` to "Chooser", build out semantic html for "results" area
2 parents 1faa370 + bea8911 commit ec6cde2

File tree

2 files changed

+99
-5
lines changed

2 files changed

+99
-5
lines changed

src/index.html

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<header>
2121
<div class="masthead">
22-
<h1><a class="identity-logo product" href="#">Vocabulary</a></h1>
22+
<h1><a class="identity-logo product" href="#">Chooser</a></h1>
2323
<button class="expand-menu">Menu</button>
2424
<nav class="primary-menu" aria-label="Primary navigation">
2525
<ul>
@@ -309,9 +309,32 @@ <h1>Choose a License for Your Work</h1>
309309

310310
<aside>
311311
<div id="license-recommendation">
312-
<p>[license recommendation info here]</p>
312+
<h2>Recommended License</h2>
313+
314+
<article class="license">
315+
316+
<header>
317+
<h3>CC-BY 4.0</h3>
318+
<h4>Creative Commons Attribution 4.0 International</h4>
319+
</header>
320+
321+
<div class="description">
322+
<p>This license requires that reusers give credit to the creator. It allows reusers to distribute, remix, adapt, and build upon the material in any medium or format, even for commercial purposes.</p>
323+
</div>
324+
325+
<dl class="conditions-definitions">
326+
<dt class="icon-attach cc-by">BY</dt>
327+
<dd>Credit must be given to you, the creator.</dd>
328+
</dl>
329+
330+
<a href="https://creativecommons.org/licenses/by/4.0/?ref=chooser-v2">See the License Deed</a>
331+
332+
</article>
333+
</div>
334+
335+
<div id="attribution-information">
336+
<p>[attribution info here]</p>
313337
</div>
314-
<p>[attribution info here]</p>
315338
</aside>
316339

317340
</div>
@@ -371,10 +394,10 @@ <h2>Support Our Work</h2>
371394
<p>Except where otherwise <a href="/policies/#license">noted</a>, content on this site is licensed under a <a href="/licenses/by/4.0/">Creative Commons Attribution 4.0 International license</a>. Icons by <a href="https://fontawesome.com/" target="_blank">Font Awesome</a>.</p>
372395

373396
<svg>
374-
<use href="../../src/svg/cc/icons/cc-icons.svg#cc-logo"></use>
397+
<use href="vocabulary/svg/cc/icons/cc-icons.svg#cc-logo"></use>
375398
</svg>
376399
<svg>
377-
<use href="../../src/svg/cc/icons/cc-icons.svg#cc-by"></use>
400+
<use href="vocabulary/svg/cc/icons/cc-icons.svg#cc-by"></use>
378401
</svg>
379402
</div>
380403

@@ -383,5 +406,10 @@ <h2>Support Our Work</h2>
383406
<script src="vocabulary/js/vocabulary.js"></script>
384407
<script src="scripts.js"></script>
385408

409+
410+
<template id="license">
411+
<!-- placeholder for swapping out content later with JS -->
412+
</template>
413+
386414
</body>
387415
</html>

src/style.css

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,67 @@
11
@import 'vocabulary/css/vocabulary.css' layer(vocabulary);
2+
3+
4+
:root {
5+
6+
/* localized cc sprite names */
7+
--cc-by: url('/vocabulary/svg/cc/icons/cc-icons.svg#cc-by');
8+
--cc-nc: url('/vocabulary/svg/cc/icons/cc-icons.svg#cc-nc');
9+
--cc-nd: url('/vocabulary/svg/cc/icons/cc-icons.svg#cc-nd');
10+
--cc-pd: url('/vocabulary/svg/cc/icons/cc-icons.svg#cc-pd');
11+
--cc-pdm: url('/vocabulary/svg/cc/icons/cc-icons.svg#cc-pdm');
12+
--cc-sa: url('/vocabulary/svg/cc/icons/cc-icons.svg#cc-sa');
13+
--cc-zero: url('/vocabulary/svg/cc/icons/cc-icons.svg#cc-zero');
14+
}
15+
16+
.icon-attach.cc-by:before {
17+
--icon-sprite: var(--cc-by);
18+
/* --icon-sprite-size: 2em; */
19+
margin-right: .2em;
20+
margin-bottom: -.125em;
21+
}
22+
23+
.icon-attach.cc-nc:before {
24+
--icon-sprite: var(--cc-nc);
25+
/* --icon-sprite-size: 2em; */
26+
margin-right: .2em;
27+
margin-bottom: -.125em;
28+
}
29+
30+
.icon-attach.cc-nd:before {
31+
--icon-sprite: var(--cc-nd);
32+
/* --icon-sprite-size: 2em; */
33+
margin-right: .2em;
34+
margin-bottom: -.125em;
35+
}
36+
37+
.icon-attach.cc-pd:before {
38+
--icon-sprite: var(--cc-pd);
39+
/* --icon-sprite-size: 2em; */
40+
margin-right: .2em;
41+
margin-bottom: -.125em;
42+
}
43+
44+
.icon-attach.cc-pdm:before {
45+
--icon-sprite: var(--cc-pdm);
46+
/* --icon-sprite-size: 2em; */
47+
margin-right: .2em;
48+
margin-bottom: -.125em;
49+
}
50+
51+
.icon-attach.cc-sa:before {
52+
--icon-sprite: var(--cc-sa);
53+
/* --icon-sprite-size: 2em; */
54+
margin-right: .2em;
55+
margin-bottom: -.125em;
56+
}
57+
58+
.icon-attach.cc-zero:before {
59+
--icon-sprite: var(--cc-zero);
60+
/* --icon-sprite-size: 2em; */
61+
margin-right: .2em;
62+
margin-bottom: -.125em;
63+
}
64+
65+
dt, dd {
66+
display: inline-block;
67+
}

0 commit comments

Comments
 (0)