Skip to content

Commit 2e488cf

Browse files
kamilszewczyk0kamilszewczyk0
committed
changed color palette and left nav stays after click
1 parent 18189ee commit 2e488cf

4 files changed

Lines changed: 130 additions & 70 deletions

File tree

‎scaladoc/resources/dotty_res/scripts/ux.js‎

Lines changed: 68 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,75 +7,103 @@ window.addEventListener("DOMContentLoaded", () => {
77
};
88
}
99

10-
var elements = document.getElementsByClassName("documentableElement")
10+
var scrollPosition = sessionStorage.getItem("scroll_value");
11+
console.log(scrollPosition);
12+
if (scrollPosition) {
13+
var sideMenu = document.querySelector(".side-menu");
14+
sideMenu.scrollTo(0, scrollPosition);
15+
}
16+
17+
var elements = document.getElementsByClassName("documentableElement");
1118
if (elements) {
1219
for (i = 0; i < elements.length; i++) {
13-
var expanderChild = elements[i].querySelector(".documentableElement-expander")
14-
if (elements[i].querySelector(".show-content") !== null && expanderChild !== null) {
20+
var expanderChild = elements[i].querySelector(
21+
".documentableElement-expander",
22+
);
23+
if (
24+
elements[i].querySelector(".show-content") !== null &&
25+
expanderChild !== null
26+
) {
1527
expanderChild.onclick = function (e) {
1628
if (!$(e.target).is("a") && e.fromSnippet !== true) {
17-
this.parentElement.classList.toggle("expand")
18-
this.querySelector(".show-content").classList.toggle("expand")
29+
this.parentElement.classList.toggle("expand");
30+
this.querySelector(".show-content").classList.toggle("expand");
1931
}
20-
}
32+
};
2133
}
2234
}
2335
}
2436

25-
var documentableLists = document.getElementsByClassName("documentableList")
37+
var documentableLists = document.getElementsByClassName("documentableList");
2638
if (documentableLists) {
2739
for (i = 0; i < documentableLists.length; i++) {
28-
documentableLists[i].children[0].onclick = function(e) {
40+
documentableLists[i].children[0].onclick = function (e) {
2941
this.classList.toggle("expand");
3042
this.parentElement.classList.toggle("expand");
31-
}
43+
};
3244
}
3345
}
3446

35-
var memberLists = document.getElementsByClassName("tab")
47+
var memberLists = document.getElementsByClassName("tab");
3648
if (memberLists) {
3749
for (i = 0; i < memberLists.length; i++) {
3850
if ($(memberLists[i].children[0]).is("button")) {
39-
memberLists[i].children[0].onclick = function(e) {
51+
memberLists[i].children[0].onclick = function (e) {
4052
this.classList.toggle("expand");
4153
this.parentElement.classList.toggle("expand");
42-
}
54+
};
4355
}
4456
}
4557
}
4658

47-
$(".side-menu span").on('click', function () {
48-
$(this).parent().toggleClass("expanded")
59+
$(".side-menu span").on("click", function () {
60+
$(this).parent().toggleClass("expanded");
4961
});
5062

51-
$(".ar").on('click', function (e) {
52-
$(this).parent().parent().toggleClass("expanded")
53-
$(this).toggleClass("expanded")
54-
e.stopPropagation()
63+
$(".ar").on("click", function (e) {
64+
$(this).parent().parent().toggleClass("expanded");
65+
$(this).toggleClass("expanded");
66+
e.stopPropagation();
5567
});
5668

57-
document.querySelectorAll(".nh").forEach(el => el.addEventListener('click', () => {
58-
el.lastChild.click()
59-
el.first.addClass("expanded")
60-
el.parent.addClass("expanded")
61-
}))
62-
63-
document.querySelectorAll(".supertypes").forEach(el => el.firstChild.addEventListener('click', () => {
64-
el.classList.toggle("collapsed");
65-
el.firstChild.classList.toggle("expand");
66-
}))
67-
68-
69-
document.querySelectorAll(".subtypes").forEach(el => el.firstChild.addEventListener('click', () => {
70-
el.classList.toggle("collapsed");
71-
el.firstChild.classList.toggle("expand");
72-
}))
73-
74-
document.querySelectorAll(".nh").forEach(el => el.addEventListener('click', () => {
75-
el.lastChild.click()
76-
el.first.addClass("expanded")
77-
el.parent.addClass("expanded")
78-
}))
69+
document.querySelectorAll(".nh").forEach((el) =>
70+
el.addEventListener("click", () => {
71+
el.lastChild.click();
72+
el.first.addClass("expanded");
73+
el.parent.addClass("expanded");
74+
}),
75+
);
76+
77+
document.querySelectorAll(".supertypes").forEach((el) =>
78+
el.firstChild.addEventListener("click", () => {
79+
el.classList.toggle("collapsed");
80+
el.firstChild.classList.toggle("expand");
81+
}),
82+
);
83+
84+
document.querySelectorAll(".subtypes").forEach((el) =>
85+
el.firstChild.addEventListener("click", () => {
86+
el.classList.toggle("collapsed");
87+
el.firstChild.classList.toggle("expand");
88+
}),
89+
);
90+
91+
document.querySelectorAll(".nh").forEach((el) =>
92+
el.addEventListener("click", () => {
93+
el.lastChild.click();
94+
el.first.addClass("expanded");
95+
el.parent.addClass("expanded");
96+
}),
97+
);
98+
99+
document.querySelectorAll(".ni").forEach((link) =>
100+
link.addEventListener("mouseenter", (e) => {
101+
sessionStorage.setItem(
102+
"scroll_value",
103+
link.offsetTop - window.innerHeight / 2,
104+
);
105+
}),
106+
);
79107

80108
const observer = new IntersectionObserver(entries => {
81109
entries.forEach(entry => {

‎scaladoc/resources/dotty_res/styles/theme/colors.css‎

Lines changed: 52 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,32 @@
33
*/
44
:root {
55
/* grey colors */
6-
--grey1: #ffffff;
7-
--grey2: #f9f8f9;
8-
--grey3: #f4f2f4;
9-
--grey4: #eeedef;
10-
--grey5: #e9e8ea;
11-
--grey6: #e4e2e4;
12-
--grey7: #dcdbdd;
13-
--grey8: #c8c7cb;
14-
--grey9: #908e96;
15-
--grey10: #86848d;
16-
--grey11: #6f6e77;
17-
--grey12: #1a1523;
6+
--grey1: #fcfcfc;
7+
--grey2: #f8f8f8;
8+
--grey3: #f3f3f3;
9+
--grey4: #ededed;
10+
--grey5: #e8e8e8;
11+
--grey6: #e2e2e2;
12+
--grey7: #dbdbdb;
13+
--grey8: #c7c7c7;
14+
--grey9: #8f8f8f;
15+
--grey10: #858585;
16+
--grey11: #6f6f6f;
17+
--grey12: #171717;
18+
19+
/* mauve colors */
20+
--mauve1: #ffffff;
21+
--mauve2: #f9f8f9;
22+
--mauve3: #f4f2f4;
23+
--mauve4: #eeedef;
24+
--mauve5: #e9e8ea;
25+
--mauve6: #e4e2e4;
26+
--mauve7: #dcdbdd;
27+
--mauve8: #c8c7cb;
28+
--mauve9: #908e96;
29+
--mauve10: #86848d;
30+
--mauve11: #6f6e77;
31+
--mauve12: #1a1523;
1832

1933
/* red colors */
2034
--red1: #fffcfc;
@@ -165,18 +179,32 @@
165179
dark theme
166180
*/
167181
:root.theme-dark {
168-
--grey1: #161618;
169-
--grey2: #1c1c1f;
170-
--grey3: #232326;
171-
--grey4: #28282c;
172-
--grey5: #2e2e32;
173-
--grey6: #34343a;
174-
--grey7: #3e3e44;
175-
--grey8: #504f57;
176-
--grey9: #706f78;
177-
--grey10: #7e7d86;
178-
--grey11: #a09fa6;
179-
--grey12: #ededef;
182+
--grey1: #161616;
183+
--grey2: #1c1c1c;
184+
--grey3: #232323;
185+
--grey4: #282828;
186+
--grey5: #2e2e2e;
187+
--grey6: #343434;
188+
--grey7: #3e3e3e;
189+
--grey8: #505050;
190+
--grey9: #707070;
191+
--grey10: #7e7e7e;
192+
--grey11: #a0a0a0;
193+
--grey12: #ededed;
194+
195+
/* muave colors */
196+
--mauve1: #161618;
197+
--mauve2: #1c1c1f;
198+
--mauve3: #232326;
199+
--mauve4: #28282c;
200+
--mauve5: #2e2e32;
201+
--mauve6: #34343a;
202+
--mauve7: #3e3e44;
203+
--mauve8: #504f57;
204+
--mauve9: #706f78;
205+
--mauve10: #7e7d86;
206+
--mauve11: #a09fa6;
207+
--mauve12: #ededef;
180208

181209
/* red colors */
182210
--red1: #1f1315;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
#toc li > ul {
2222
margin-top: calc(2.5 * var(--base-spacing));
23-
margin-left: calc(1.5 * var(--base-spacing));
2423
}
2524

2625
@media (min-width: 1920px) {

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,21 @@
44
margin-top: calc(6 * var(--base-spacing));
55
}
66

7+
.arrow-navigation > div {
8+
width: 50%;
9+
}
10+
11+
.arrow-navigation > div:first-child {
12+
padding-right: 12px;
13+
}
14+
715
.arrow-navigation > div:last-child {
8-
margin-left: auto;
16+
text-align: right;
17+
padding-left: 12px;
918
}
1019

1120
.arrow-navigation > div > span {
1221
display: block;
1322
margin-bottom: calc(1 * var(--base-spacing));
1423
color: var(--text-secondary);
15-
}
16-
17-
.arrow-navigation--next {
18-
text-align: right;
1924
}

0 commit comments

Comments
 (0)