Skip to content

Commit

Permalink
Release v1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
wb14123 committed Sep 21, 2024
1 parent 52b056c commit 5802a7e
Show file tree
Hide file tree
Showing 40 changed files with 2,308 additions and 83,385 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
target/
*.class
.bsp/
node_modules/
js/dist
14 changes: 14 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import scala.language.postfixOps
import scala.sys.process._
import sbt._

name := "rss_brain"

Expand Down Expand Up @@ -64,6 +66,18 @@ validateRsshubRules := Def.taskDyn {
}
}.value

lazy val webpack = taskKey[Unit]("Run webpack in js directory")
webpack := {
val workDir = new File("./js")
Process("npm" :: "install" :: Nil, workDir) #&& Process("npx" :: "webpack" :: Nil, workDir) !
}

Compile / resourceGenerators += Def.task {
webpack.value
val file = (Compile / resourceManaged).value / "webview" / "static" / "dist"
IO.copyDirectory(new File("./js/dist"), file, overwrite = true)
IO.listFiles(file).toSeq
}.taskValue

assemblyMergeStrategy in assembly := {
case x if x.endsWith("META-INF/services/io.grpc.LoadBalancerProvider") => MergeStrategy.first
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(/static/lib/flUhRq6tzZclQEJ-Vdg-IuiaDsNZ.ttf) format('truetype');
src: url(../fonts/google-material-icons.ttf) format('truetype');
}
@font-face {
font-family: 'Material Icons Outlined';
font-style: normal;
font-weight: 400;
src: url(/static/lib/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUcd.otf) format('opentype');
src: url(../fonts/google-material-icons-outlined.otf) format('opentype');
}

.material-icons {
Expand Down
16 changes: 12 additions & 4 deletions ...ain/resources/webview/static/css/main.css → js/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -588,9 +588,11 @@ progress {
}

.article-grid img {
aspect-ratio: 16 / 9;
object-fit: cover;
width: 100%;
}

.article-grid .video-img {
aspect-ratio: 16 / 9;
}

.article-info {
Expand All @@ -613,13 +615,13 @@ progress {
.article-media {
display: flex;
flex-direction: row;
overflow-x: scroll;
}

.article-media img {
margin: 0 auto;
border-radius: 2%;
max-height: 260px;
overflow: hidden;
}

.article-content {
Expand Down Expand Up @@ -965,4 +967,10 @@ popover-content a:hover {
flex-grow: 1;
flex-shrink: 1;
flex-basis: auto;
}
}

/* fix pico override of viewer-js styles */
.viewer-footer [role="button"] {
padding: 0 0 0 0;
font-size: 0; /* needed for Chrome */
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 5802a7e

Please sign in to comment.