Skip to content

Commit 72b0729

Browse files
committed
Fix conflicts after scaladoc rename
1 parent a64a34f commit 72b0729

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/scaladoc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
java-version: 11
3737

3838
- name: Compile and test scala3doc-js
39-
run: ./project/scripts/sbt scala3doc-js/test
39+
run: ./project/scripts/sbt scaladoc-js/test
4040

4141
- name: Compile and test
4242
run: ./project/scripts/sbt scaladoc/test

scaladoc-js/resources/scaladoc-searchbar.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
display: none;
4141
}
4242

43-
#scala3doc-searchbar {
43+
#scaladoc-searchbar {
4444
position: fixed;
4545
top: 50px;
4646
right: 40px;
@@ -71,7 +71,7 @@
7171
overflow: auto;
7272
}
7373

74-
.scala3doc-searchbar-result {
74+
.scaladoc-searchbar-result {
7575
background: white;
7676
line-height: 32px;
7777
padding-left: 10px;
@@ -82,7 +82,7 @@
8282
margin-top: 10px;
8383
}
8484

85-
.scala3doc-searchbar-result[selected] {
85+
.scaladoc-searchbar-result[selected] {
8686
background-color: #d4edff;
8787
}
8888

scaladoc-js/src/searchbar/SearchbarComponent.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class SearchbarComponent(val callback: (String) => List[PageEntry]):
107107
else if e.keyCode == 38 then handleArrowUp()
108108
else if e.keyCode == 13 then handleEnter()
109109
})
110-
element.id = "scala3doc-searchbar"
110+
element.id = "scaladoc-searchbar"
111111
element.appendChild(input)
112112
element.appendChild(resultsDiv)
113113
element

scala3doc-js/test/dotty/dokka/MatchersTest.scala renamed to scaladoc-js/test/dotty/dokka/MatchersTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dotty.dokka
1+
package dotty.tools.scaladoc
22

33
import org.junit.{Test, Assert}
44
import org.junit.Assert._

scala3doc-js/test/dotty/dokka/QueryParserTest.scala renamed to scaladoc-js/test/dotty/dokka/QueryParserTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dotty.dokka
1+
package dotty.tools.scaladoc
22

33
import org.junit.{Test, Assert}
44
import org.junit.Assert._

0 commit comments

Comments
 (0)