merg fix

lgmxiii · Apr 4, 2017 · f7cae16 · f7cae16
1 parent 9650890
commit f7cae16
Show file tree

Hide file tree

Showing 5 changed files with 293 additions and 290 deletions.
diff --git a/MyNovelReader/MyNovelReader.user.js b/MyNovelReader/MyNovelReader.user.js
@@ -2000,7 +2000,7 @@ Rule.replace = {
     "@{3,}": "",
 
     // === 段末的多余的r ===
-    "r<br>":"<br>",
+    "\\\\r<br>":"<br>",
 
     // === 一些特殊的替换 ===
     "\\[+CP.*(http://file.*\\.jpg)\\]+": "<img src='$1'>",

diff --git a/MyNovelReader/package.json b/MyNovelReader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MyNovelReader",
-  "version": "5.3.5",
+  "version": "5.3.6",
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-contrib-jshint": "~0.10.0",

diff --git a/MyNovelReader/src/UI.js b/MyNovelReader/src/UI.js
@@ -462,7 +462,7 @@ UI.skins["棕黄背景".uiTrans()] = "body { color: black; background-color: #C2
 UI.skins["经典皮肤".uiTrans()] = "body { color: black; background-color: #EAEAEE; } .title { background-color: #f0f0f0; }";
 
 
-var fontawesomeWoff = "http://libs.baidu.com/fontawesome/4.0.3/fonts/fontawesome-webfont.woff?v=4.0.3";
+var fontawesomeWoff = "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/fonts/fontawesome-webfont.woff";
 
 
 var Res = {