Merge branch 'betterBMS' of https://github.com/kaonasi-biwa/Floorp in…

…to ESR102
sorokinvld · May 25, 2023 · e046568 · e046568
2 parents f018db1 + e774e9d
commit e046568
Show file tree

Hide file tree

Showing 9 changed files with 441 additions and 971 deletions.
diff --git a/floorp/browser/base/content/browser-design.js b/floorp/browser/base/content/browser-design.js
@@ -22,7 +22,8 @@ function setBrowserDesign() {
     gnomeUI: `@import url(chrome://browser/skin/gnomeUI/gnomeUI.css);`,
     FluerialUI: `@import url(chrome://browser/skin/floorplegacy/test_legacy.css);`,
     FluerialUIMultitab:`@import url(chrome://browser/skin/floorplegacy/test_legacy.css);
-                        @import url(chrome://browser/skin/floorplegacy/test_legacy_multitab.css);`
+                        @import url(chrome://browser/skin/floorplegacy/test_legacy_multitab.css);`,
+    WebkitUI: `@import url(chrome://browser/skin/webkitUI/webkitUI.css);`,
   }
   var Tag = document.createElement('style');
   Tag.setAttribute("id", "browserdesgin");
@@ -45,6 +46,9 @@ function setBrowserDesign() {
     case 6:
       if (AppConstants.platform == "linux") Tag.innerText = ThemeCSS.gnomeUI;
       break;
+    case 7:
+      Tag.innerText = ThemeCSS.WebkitUI;
+      break;
     case 8: 
       Tag.innerText = Services.prefs.getBoolPref("floorp.enable.multitab", false) ? ThemeCSS.FluerialUIMultitab : ThemeCSS.FluerialUI;
       break;

diff --git a/floorp/browser/themes/designs/webkitUI/go-next-symbolic.svg b/floorp/browser/themes/designs/webkitUI/go-next-symbolic.svg
diff --git a/floorp/browser/themes/designs/webkitUI/go-previous-symbolic.svg b/floorp/browser/themes/designs/webkitUI/go-previous-symbolic.svg
diff --git a/floorp/browser/themes/designs/webkitUI/pan-down-symbolic.svg b/floorp/browser/themes/designs/webkitUI/pan-down-symbolic.svg
diff --git a/floorp/browser/themes/designs/webkitUI/pan-start-symbolic.svg b/floorp/browser/themes/designs/webkitUI/pan-start-symbolic.svg
diff --git a/floorp/browser/themes/designs/webkitUI/webkitUI.css b/floorp/browser/themes/designs/webkitUI/webkitUI.css
diff --git a/floorp/browser/themes/designs/webkitUI/window-close-symbolic-light.svg b/floorp/browser/themes/designs/webkitUI/window-close-symbolic-light.svg
diff --git a/floorp/browser/themes/designs/webkitUI/window-close-symbolic.svg b/floorp/browser/themes/designs/webkitUI/window-close-symbolic.svg
diff --git a/floorp/browser/themes/jar.mn b/floorp/browser/themes/jar.mn
@@ -462,6 +462,15 @@ browser.jar:
   skin/classic/browser/floorplegacy/test_legacy.css           (designs/floorp-legacy/test_legacy.css)
   skin/classic/browser/floorplegacy/test_legacy_multitab.css  (designs/floorp-legacy/test_legacy_multitab.css)
 
+# WebkitUI
+  skin/classic/browser/webkitUI/webkitUI.css                        (designs/webkitUI/webkitUI.css)
+  skin/classic/browser/webkitUI/go-previous-symbolic.svg            (designs/webkitUI/go-previous-symbolic.svg)
+  skin/classic/browser/webkitUI/go-next-symbolic.svg                (designs/webkitUI/go-next-symbolic.svg)
+  skin/classic/browser/webkitUI/pan-start-symbolic.svg              (designs/webkitUI/pan-start-symbolic.svg)
+  skin/classic/browser/webkitUI/window-close-symbolic.svg           (designs/webkitUI/window-close-symbolic.svg)
+  skin/classic/browser/webkitUI/window-close-symbolic-light.svg     (designs/webkitUI/window-close-symbolic-light.svg)
+  skin/classic/browser/webkitUI/pan-down-symbolic.svg               (designs/webkitUI/pan-down-symbolic.svg)
+
 # New tab background images
   skin/classic/browser/newtabbg-0.webp                            　 (newtabbg/newtabbg-0.webp)
   skin/classic/browser/newtabbg-1.webp                             　(newtabbg/newtabbg-1.webp)