Skip to content

Commit 6e38b9f

Browse files
authored
Merge pull request #19 from pikinier20/scaladoc/contributors-content-part
Contributors component
2 parents 3f6e294 + 645dbfa commit 6e38b9f

File tree

7 files changed

+88
-21
lines changed

7 files changed

+88
-21
lines changed

docs/_layouts/static-site-main.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
{% endif %}
3434
</nav>
3535
<div class="content-contributors hidden">
36-
<span><b>Contributors to this page</b></span>
36+
<h1 class="h200">Contributors to this page</h1>
3737
<div id="documentation-contributors" class="contributors-container"></div>
3838
</div>
3939
</div>

project/resources/referenceReplacements/_layouts/static-site-main.html

+19-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
layout: main
33
---
4+
45
<div class="container">
56
<div id="site-header">
67
<div class="wrap">
@@ -31,20 +32,29 @@
3132
{{ content }}
3233
<nav class="arrows-wrapper" aria-label="Page navigation">
3334
{% if page.previous %}
34-
<a rel="prev" href="{{ page.previous.url }}" class="arrows previous" aria-keyshortcuts="Left">
35-
<span>{{ page.previous.title }}</span>
36-
<i class="fa fa-angle-left"></i>
35+
<a
36+
rel="prev"
37+
href="{{ page.previous.url }}"
38+
class="arrows previous"
39+
aria-keyshortcuts="Left"
40+
>
41+
<span>{{ page.previous.title }}</span>
42+
<i class="fa fa-angle-left"></i>
3743
</a>
38-
{% endif %}
39-
{% if page.next %}
40-
<a rel="next" href="{{ page.next.url }}" class="arrows next" aria-keyshortcuts="Right">
41-
<span>{{ page.next.title }}</span>
42-
<i class="fa fa-angle-right"></i>
44+
{% endif %} {% if page.next %}
45+
<a
46+
rel="next"
47+
href="{{ page.next.url }}"
48+
class="arrows next"
49+
aria-keyshortcuts="Right"
50+
>
51+
<span>{{ page.next.title }}</span>
52+
<i class="fa fa-angle-right"></i>
4353
</a>
4454
{% endif %}
4555
</nav>
4656
<div class="content-contributors hidden">
47-
<span><b>Contributors to this page</b></span>
57+
<h1 class="h200">Contributors to this page</h1>
4858
<div id="documentation-contributors" class="contributors-container"></div>
4959
</div>
5060
</div>

scaladoc-testcases/docs/_layouts/static-site-main.html

+19-9
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,34 @@
55
- css/bootstrap.min.css
66
- css/content-contributors.css
77
---
8+
89
<div class="container">
910
{{ content }}
1011
<nav class="arrows-wrapper" aria-label="Page navigation">
1112
{% if page.previous %}
12-
<a rel="prev" href="{{ page.previous.url }}" class="arrows previous" aria-keyshortcuts="Left">
13-
<span>{{ page.previous.title }}</span>
14-
<i class="fa fa-angle-left"></i>
13+
<a
14+
rel="prev"
15+
href="{{ page.previous.url }}"
16+
class="arrows previous"
17+
aria-keyshortcuts="Left"
18+
>
19+
<span>{{ page.previous.title }}</span>
20+
<i class="fa fa-angle-left"></i>
1521
</a>
16-
{% endif %}
17-
{% if page.next %}
18-
<a rel="next" href="{{ page.next.url }}" class="arrows next" aria-keyshortcuts="Right">
19-
<span>{{ page.next.title }}</span>
20-
<i class="fa fa-angle-right"></i>
22+
{% endif %} {% if page.next %}
23+
<a
24+
rel="next"
25+
href="{{ page.next.url }}"
26+
class="arrows next"
27+
aria-keyshortcuts="Right"
28+
>
29+
<span>{{ page.next.title }}</span>
30+
<i class="fa fa-angle-right"></i>
2131
</a>
2232
{% endif %}
2333
</nav>
2434
<div class="content-contributors hidden">
25-
<span><b>Contributors to this page</b></span>
35+
<h1 class="h200">Contributors to this page</h1>
2636
<div id="documentation-contributors" class="contributors-container"></div>
2737
</div>
2838
</div>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
.content-contributors {
2+
background-color: var(--background-neutral);
3+
padding: calc(3 * var(--base-spacing));
4+
border-radius: 4px;
5+
}
6+
7+
.content-contributors .contributors-container {
8+
row-gap: calc(3 * var(--base-spacing));
9+
column-gap: calc(4 * var(--base-spacing));
10+
}
11+
12+
.content-contributors h1 {
13+
color: var(--text-primary);
14+
margin-bottom: calc(3 * var(--base-spacing));
15+
}
16+
17+
.content-contributors .contributors-container div img {
18+
border-radius: 50%;
19+
margin-right: calc(1.5 * var(--base-spacing));
20+
}
21+
22+
#content .content-contributors .contributors-container div a {
23+
text-decoration: none;
24+
}
25+
26+
.content-contributors .contributors-container {
27+
padding: 0;
28+
}

scaladoc/resources/dotty_res/styles/theme/components/table-of-content.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
margin-bottom: calc(2 * var(--base-spacing));
4646
}
4747

48-
.toc-nav a{
48+
#content .toc-nav a {
4949
color: var(--action-primary-content-default);
5050
text-decoration: none;
5151
}

scaladoc/resources/dotty_res/styles/theme/layout/content.css

+19-1
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,26 @@
6060
}
6161
}
6262

63-
#content h1 {
63+
/* content headers */
64+
65+
#content h1, #content h2 {
66+
color: var(--text-primary);
67+
}
68+
69+
/* content paragraph */
70+
#content p {
71+
color: var(--text-secondary);
72+
}
73+
74+
/* content list */
75+
#content li {
76+
color: var(--text-primary);
77+
}
78+
79+
/* content link */
80+
#content a {
6481
color: var(--text-primary);
82+
text-decoration: underline;
6583
}
6684

6785
.breadcrumbs {

scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala

+1
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
121121
"styles/theme/components/dropdown-menu.css",
122122
"styles/theme/components/divider.css",
123123
"styles/theme/components/table-of-content.css",
124+
"styles/theme/components/contributors.css",
124125

125126
"styles/nord-light.css",
126127
"styles/dotty-icons.css",

0 commit comments

Comments
 (0)