Skip to content

Commit 9524c52

Browse files
authored
Merge pull request #17 from pikinier20/scaladoc/header-fixes
Header review fixes
2 parents c2b4d45 + 98bf4e4 commit 9524c52

File tree

7 files changed

+28
-19
lines changed

7 files changed

+28
-19
lines changed

scaladoc-js/main/src/versions-dropdown/DropdownHandler.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ end DropdownHandler
6666
@JSExportTopLevel("dropdownHandler")
6767
def dropdownHandler(e: Event) =
6868
e.stopPropagation()
69-
console.log("clikc")
7069
if document.getElementById("version-dropdown").getElementsByTagName("a").size > 0 &&
7170
window.getSelection.toString.length == 0 then
7271
document.getElementById("version-dropdown").classList.toggle("expanded")
Lines changed: 11 additions & 10 deletions
Loading

scaladoc/resources/dotty_res/styles/theme/components/button/icon-button.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
content: url("../../../../images/icon-buttons/moon/light/selected.svg");
4949
}
5050

51+
#theme-toggle.icon-button:focus::after {
52+
content: url("../../../../images/icon-buttons/moon/light/focus.svg");
53+
}
54+
5155
.theme-dark #theme-toggle.icon-button::after {
5256
content: url("../../../../images/icon-buttons/sun/dark/default.svg");
5357
}
@@ -72,6 +76,10 @@
7276
content: url("../../../../images/icon-buttons/sun/dark/selected.svg");
7377
}
7478

79+
.theme-dark #theme-toggle.icon-button:focus::after {
80+
content: url("../../../../images/icon-buttons/sun/dark/focus.svg");
81+
}
82+
7583
/* search-toggle button */
7684

7785
#search-toggle.icon-button::after {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
box-shadow: 0px 10px 38px -10px var(--shadow-first),
1010
0px 10px 20px -15px var(--shadow-second),
1111
inset 0px 0px 0px 1px var(--shadow-inset);
12-
border: none;
12+
border: none;
1313
border-radius: 4px;
1414
z-index: 2;
15+
justify-content: center;
16+
align-items: center;
1517
}
1618

1719
.floating-button:disabled {
@@ -120,6 +122,6 @@
120122

121123
@media (max-width: 1024px) {
122124
.floating-button {
123-
display: block;
125+
display: flex;
124126
}
125127
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
text-decoration: none;
4949
color: var(--action-primary-content-default);
5050
border-bottom: 1px solid var(--border-default);
51-
padding: calc(1.5 * var(--base-spacing)) calc(2 * var(--base-spacing));
51+
padding: calc(2.5 * var(--base-spacing)) calc(2 * var(--base-spacing));
5252
display: flex;
5353
align-items: center;
5454
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
overflow-y: auto;
33
overflow-x: hidden;
44
width: 100%;
5-
height: 100%;
5+
height: calc(100% - calc(11 * var(--base-spacing)));
66
padding-left: calc(1.5 * var(--base-spacing));
77
padding-right: calc(1.5 * var(--base-spacing));
8-
padding-bottom: calc(3 * var(--base-spacing));
98
box-sizing: border-box;
109
}
1110

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
240240
a(href := "https://www.scala-lang.org/blog/", cls := "text-button") (
241241
"Community",
242242
),
243-
button(id := "theme-toggle", cls := "icon-button"),
244-
button(id := "mobile-menu-toggle", cls := "icon-button hamburger"),
243+
span(id := "theme-toggle", cls := "icon-button"),
244+
span(id := "mobile-menu-toggle", cls := "icon-button hamburger"),
245245
),
246246
),
247247
div(id := "mobile-menu")(
@@ -275,7 +275,7 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
275275
span(id := "mobile-theme-toggle", cls := "mobile-menu-item mode"),
276276
)
277277
),
278-
button(id := "mobile-sidebar-toggle", cls := "floating-button"),
278+
span(id := "mobile-sidebar-toggle", cls := "floating-button"),
279279
div(id := "leftColumn", cls := "body-small")(
280280
Seq(
281281
div(cls:= "switcher-container")(

0 commit comments

Comments
 (0)