Merge pull request #39 from yang991178/0.6.1

Version 0.6.1
yang991178 · Jul 17, 2020 · 834dc55 · 834dc55
2 parents 5aacbb7 + 617ccea
commit 834dc55
Show file tree

Hide file tree

Showing 28 changed files with 1,206 additions and 942 deletions.
diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml
@@ -22,12 +22,16 @@ jobs:
       id: package-version
       uses: martinbeentjes/npm-get-version-action@master
 
+    - name: Get release
+      id: get_release
+      uses: bruceadams/get-release@v1
+
     - name: Upload AppImage to release assets
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/yang991178/fluent-reader/releases/${{ github.ref }}/assets
+        upload_url: ${{ steps.get_release.outputs.upload_url }}
         asset_path: ./bin/linux/x64/Fluent Reader-${{ steps.package-version.outputs.current-version }}.AppImage
         asset_name: Fluent.Reader.${{ steps.package-version.outputs.current-version }}.AppImage
         asset_content_type: application/octet-stream
diff --git a/dist/article/article.css b/dist/article/article.css
@@ -1,3 +1,5 @@
+@import "../styles/scroll.css";
+
 html, body {
     font-family: "Segoe UI", "Source Han Sans SC Regular", "Microsoft YaHei", sans-serif;
 }

diff --git a/dist/article/article.html b/dist/article/article.html
@@ -5,7 +5,6 @@
     <meta http-equiv="Content-Security-Policy"
         content="default-src 'none'; script-src-elem 'sha256-iiXdy1GW3jlpYWJzQD+GvmCWg6e+JhQDFjBmllOw8JM='; img-src http://* https://*; style-src 'self' 'unsafe-inline'; frame-src http://* https://*; media-src http://* https://*">
     <title>Article</title>
-    <link rel="stylesheet" href="scroll.css" />
     <link rel="stylesheet" href="article.css" />
 </head>
 <body>

diff --git a/dist/index.css b/dist/index.css
@@ -0,0 +1,6 @@
+@import "styles/scroll.css";
+@import "styles/global.css";
+@import "styles/main.css";
+@import "styles/feeds.css";
+@import "styles/cards.css";
+@import "styles/dark.css";