Skip to content

Commit c11713a

Browse files
Merge pull request #85 from creativecommons/viewport-fix-vocab
update upstream vocabulary, correct viewport resizing and padding issues
2 parents b2a515d + 60d5a31 commit c11713a

File tree

2 files changed

+51
-13
lines changed

2 files changed

+51
-13
lines changed

src/context/default-page.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h1><a class="identity-logo" href="#">Creative Commons</a></h1>
4646

4747

4848

49-
<nav class="explore-menu" aria-label="Explore menu">
49+
<div class="explore-panel">
5050

5151
<!-- (optional main CC logo, p, link on non-home site back to main site) -->
5252
<!-- <aside>
@@ -55,11 +55,11 @@ <h2>Our Work Relies On You!</h2>
5555
<p>Help us keep the internet free and open.</p>
5656
</aside> -->
5757

58-
<nav class="explore-menu">
58+
<nav class="explore-menu" aria-label="Explore menu">
5959
<ul>
6060
<li>
6161
<a href="#">Global Network</a>
62-
<p>Join a global community working to strengthen the Commons</p>
62+
<p>Join a global community working to strengthen the Commons</p>
6363
</li>
6464
<li>
6565
<a href="#">Certificate</a>

src/vocabulary/css/vocabulary.css

Lines changed: 48 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ main > aside.sidebar .attention a {
385385

386386
main h2 {
387387
width: 100%;
388+
box-sizing: border-box;
388389

389390
font-family: 'Roboto Condensed';
390391
font-style: normal;
@@ -394,6 +395,8 @@ main h2 {
394395
}
395396

396397
main h3 {
398+
box-sizing: border-box;
399+
397400
font-family: 'Roboto Condensed';
398401
font-style: normal;
399402
font-weight: 700;
@@ -510,7 +513,7 @@ main figure {
510513
padding: 0;
511514
}
512515

513-
main > article figure img, main > figure img {
516+
main > article figure img, main > figure img, main > .content figure img {
514517
width: 100%;
515518
}
516519

@@ -1133,7 +1136,7 @@ body > header .explore-panel nav ul li p {
11331136

11341137
body > article.attention {
11351138
grid-column: 1 / span 11;
1136-
padding: 1em 5%;
1139+
padding: 1em var(--vocabulary-page-edges-space);
11371140

11381141
background: var(--vocabulary-brand-color-soft-green);
11391142
font-family: 'Source Sans Pro';
@@ -1523,7 +1526,7 @@ body > footer .license svg {
15231526
}
15241527

15251528
.blog-index main .posts.featured ul {
1526-
padding: 0 5%;
1529+
padding: 0 var(--vocabulary-page-edges-space);
15271530
}
15281531

15291532
.blog-index main .posts.featured ul li {
@@ -1901,7 +1904,7 @@ body > footer .license svg {
19011904
}
19021905

19031906
.blog-index main .posts {
1904-
padding: 0 5%;
1907+
padding: 0 var(--vocabulary-page-edges-space);
19051908
}
19061909

19071910
.blog-index main footer .attribution-list ul.expand {
@@ -1950,17 +1953,51 @@ body > footer .license svg {
19501953
left: 0;
19511954
}
19521955

1956+
main .content {
1957+
padding: 0 var(--vocabulary-page-edges-space);
1958+
}
1959+
1960+
main:has( > aside.sidebar) > aside.sidebar {
1961+
padding: 0 var(--vocabulary-page-edges-space);
1962+
}
1963+
1964+
main > *:not(header) {
1965+
padding: 0 var(--vocabulary-page-edges-space);
1966+
}
1967+
1968+
main > .posts {
1969+
padding: 0 var(--vocabulary-page-edges-space);
1970+
}
1971+
19531972
.posts article figure {
19541973
width: 100%;
19551974
flex: initial;
19561975
}
19571976

1977+
.person-page main > header {
1978+
padding-left: var(--vocabulary-page-edges-space);
1979+
padding-right: var(--vocabulary-page-edges-space);
1980+
}
1981+
1982+
.person-page main > header:before {
1983+
left: 0;
1984+
}
1985+
1986+
.search-index main > header {
1987+
padding-left: var(--vocabulary-page-edges-space);
1988+
padding-right: var(--vocabulary-page-edges-space);
1989+
}
1990+
1991+
.search-index main > header:before {
1992+
left: 0;
1993+
}
1994+
19581995
.team-index main > header {
1959-
padding: 0 5%;
1996+
padding: 0 var(--vocabulary-page-edges-space);
19601997
}
19611998

19621999
.team-index main article.persons {
1963-
padding: 0 5%;
2000+
padding: 0 var(--vocabulary-page-edges-space);
19642001
}
19652002

19662003
.team-index main article.persons ul {
@@ -1979,10 +2016,6 @@ body > footer .license svg {
19792016
order: -1;
19802017
}
19812018

1982-
main nav.pagination {
1983-
width: 100%;
1984-
}
1985-
19862019
main nav.pagination ol {
19872020
/* width: 100%; */
19882021
flex-wrap: wrap;
@@ -2005,6 +2038,11 @@ body > footer .license svg {
20052038
main article.posts.related ul {
20062039
grid-template-columns: 1fr;
20072040
}
2041+
2042+
.posts .post figure {
2043+
width: 100%;
2044+
flex: initial;
2045+
}
20082046
}
20092047

20102048
@media (max-width: 425px) {

0 commit comments

Comments
 (0)