Skip to content

Commit 167586b

Browse files
fanixus96fanixus96
committed
fix rwd breakpoints
1 parent f87fef3 commit 167586b

File tree

5 files changed

+130
-22
lines changed

5 files changed

+130
-22
lines changed

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

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
#toc {
2-
position: absolute;
3-
right: 0;
42
display: flex;
53
flex-direction: column;
64
padding: 0 calc(1 * var(--base-spacing));
5+
width: calc(29 * var(--base-spacing));
6+
}
7+
8+
#toc-container {
9+
position: absolute;
710
}
811

912
#toc ul {
@@ -17,13 +20,32 @@
1720

1821
@media (min-width: 1920px) {
1922
#toc {
20-
margin-right: calc(36.75 * var(--base-spacing));
23+
margin-left: calc(8.5 * var(--base-spacing));
2124
}
2225
}
2326

2427
@media (max-width: 1920px) {
2528
#toc {
26-
margin-right: calc(6 * var(--base-spacing));
29+
margin-left: calc(8.5 * var(--base-spacing));
30+
}
31+
}
32+
33+
@media (max-width: 1436px) {
34+
#toc {
35+
margin-left: calc(8.5 * var(--base-spacing));
36+
margin-right: calc(8.5 * var(--base-spacing));
37+
}
38+
}
39+
40+
@media (max-width: 1376px) {
41+
#toc {
42+
margin-left: calc(6 * var(--base-spacing));
43+
}
44+
}
45+
46+
@media (max-width: 1366px) {
47+
#toc {
48+
left: calc(102 * var(--base-spacing));
2749
}
2850
}
2951

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

Lines changed: 97 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,125 @@
66
#content {
77
margin-left: calc(39 * var(--base-spacing));
88
display: flex;
9-
flex-flow: column;
9+
flex-flow: row;
1010
color: var(--text-primary);
11-
max-width: 55em;
12-
padding-top: calc(18 * var(--base-spacing));
13-
margin-right: auto;
14-
margin-left: auto;
11+
}
12+
13+
@media (min-width: 1920px) {
14+
#content {
15+
width: calc(90 * var(--base-spacing));
16+
padding-left: calc(36.75 * var(--base-spacing));
17+
padding-top: calc(18 * var(--base-spacing));
18+
}
1519
}
1620

1721
@media (max-width: 1920px) {
1822
#content {
19-
width: 720px;
23+
margin-left: 0;
24+
width: calc(100% - calc(39 * var(--base-spacing)));
25+
padding-top: calc(18 * var(--base-spacing));
26+
padding-bottom: calc(10 * var(--base-spacing));
27+
justify-content: center;
28+
float: right;
29+
}
30+
#content > div:first-child {
31+
width: calc(90 * var(--base-spacing));
2032
}
2133
}
2234

23-
@media (max-width: 1366px) {
35+
@media (max-width: 1436px) {
2436
#content {
25-
width: 710px;
37+
margin-left: 0;
38+
width: calc(100% - calc(56 * var(--base-spacing)));
39+
padding-top: calc(18 * var(--base-spacing));
40+
padding-bottom: calc(10 * var(--base-spacing));
41+
margin-right: calc(8.5 * var(--base-spacing));
42+
margin-left: calc(8.5 * var(--base-spacing));
43+
float: right;
44+
}
45+
#content > div:first-child {
46+
width: auto;
47+
}
48+
}
49+
50+
@media (max-width: 1376px) {
51+
#content {
52+
margin-left: 0;
53+
width: calc(100% - calc(51 * var(--base-spacing)));
54+
padding-top: calc(18 * var(--base-spacing));
55+
padding-bottom: calc(10 * var(--base-spacing));
56+
margin-right: calc(6 * var(--base-spacing));
57+
margin-left: calc(6 * var(--base-spacing));
58+
float: right;
59+
}
60+
#content > div:first-child {
61+
width: auto;
2662
}
2763
}
2864

2965
@media (max-width: 1024px) {
3066
#content {
31-
width: 648px;
67+
width: calc(100% - calc(12 * var(--base-spacing)));
68+
margin-right: calc(6 * var(--base-spacing));
69+
margin-left: calc(6 * var(--base-spacing));
70+
padding-right: 0;
71+
}
72+
73+
#content > div:first-child {
74+
width: auto;
75+
}
76+
77+
#content.sidebar-shown {
78+
width: calc(100% - calc(51 * var(--base-spacing)));
79+
padding-right: 0;
80+
}
81+
82+
#content.sidebar-shown > div:first-child {
83+
width: auto;
3284
}
3385
}
3486

3587
@media (max-width: 768px) {
3688
#content {
37-
width: 672px;
89+
margin-right: calc(6 * var(--base-spacing));
90+
margin-left: calc(6 * var(--base-spacing));
91+
padding-right: 0;
92+
width: calc(100% - calc(12 * var(--base-spacing)));
93+
}
94+
95+
#content > div:first-child {
96+
width: auto;
97+
}
98+
99+
#content.sidebar-shown {
100+
width: calc(100% - calc(51 * var(--base-spacing)));
101+
padding-right: 0;
102+
}
103+
104+
#content.sidebar-shown > div:first-child {
105+
width: auto;
38106
}
39107
}
40108

41-
@media (max-width: 390px) {
109+
@media (max-width: 428px) {
42110
#content {
43-
width: 390px;
111+
margin-right: calc(4 * var(--base-spacing));
112+
margin-left: calc(4 * var(--base-spacing));
113+
padding-right: 0;
114+
width: calc(100% - calc(8 * var(--base-spacing)));
115+
}
116+
117+
#content > div:first-child {
118+
width: auto;
119+
}
120+
121+
#content.sidebar-shown {
122+
width: calc(100% - calc(51 * var(--base-spacing)));
123+
padding-right: 0;
124+
}
125+
126+
#content.sidebar-shown > div:first-child {
127+
width: auto;
44128
}
45129
}
46130

@@ -77,7 +161,7 @@
77161
border-bottom: 1px solid var(--text-secondary);
78162
}
79163

80-
#content :not(pre)>code {
164+
#content :not(pre) > code {
81165
color: var(--code-props-content);
82166
font-family: "FiraCode-Regular";
83167
}

‎scaladoc/resources/dotty_res/styles/theme/layout/leftMenu.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
border: 1px solid var(--border-default);
1313
border-top: none;
1414
border-left: none;
15-
transition:left 0.2s linear;
15+
transition: left 0.2s linear;
1616
}
1717

1818
@media (max-width: 480px) {
@@ -31,7 +31,7 @@
3131
}
3232
}
3333

34-
@media (max-width: 390px) {
34+
@media (max-width: 428px) {
3535
#leftColumn {
3636
height: calc(100% - (8 * var(--base-spacing)));
3737
width: 100%;

‎scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,10 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
317317
content.content,
318318
renderTableOfContents(content.toc).fold(Nil) { toc =>
319319
div(id := "toc", cls:="body-small")(
320-
span(cls := "toc-title h200")("In this article"),
321-
toc
320+
div(id := "toc-container") (
321+
span(cls := "toc-title h200")("In this article"),
322+
toc
323+
),
322324
)
323325
},
324326
),

‎scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ trait SiteRenderer(using DocContext) extends Locations:
8484
document.select("img").forEach { element =>
8585
element.attr("src", processLocalLink(element.attr("src")))
8686
} // foreach does not work here. Why?
87-
PageContent(raw(document.outerHtml()), toc)
87+
PageContent(div(raw(document.outerHtml())), toc)

0 commit comments

Comments
 (0)