From 4e299c7fb9c77a9ea2f57a9a6692f43b184b9e6c Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 11 Jun 2023 17:57:14 +0800
Subject: [PATCH] update

---
 shell/lib-install.sh                         | 22 ++++++++++++++------
 src/other/firefox/WhiteSur/parts/tabsbar.css | 15 +++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/shell/lib-install.sh b/shell/lib-install.sh
index 2ed512c4..6b6e601a 100755
--- a/shell/lib-install.sh
+++ b/shell/lib-install.sh
@@ -744,12 +744,22 @@ edit_firefox_theme_prefs() {
 }
 
 remove_firefox_theme() {
-  rm -rf "${FIREFOX_DIR_HOME}/"*"default"*"/chrome"
-  rm -rf "${FIREFOX_THEME_DIR}"
-  rm -rf "${FIREFOX_FLATPAK_DIR_HOME}/"*"default"*"/chrome"
-  rm -rf "${FIREFOX_FLATPAK_THEME_DIR}"
-  rm -rf "${FIREFOX_SNAP_DIR_HOME}/"*"default"*"/chrome"
-  rm -rf "${FIREFOX_SNAP_THEME_DIR}"
+  if has_snap_app firefox; then
+    local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}"
+  elif has_flatpak_app org.mozilla.firefox; then
+    local TARGET_DIR="${FIREFOX_FLATPAK_THEME_DIR}"
+  else
+    local TARGET_DIR="${FIREFOX_THEME_DIR}"
+  fi
+
+  [[ -f "${TARGET_DIR}"/customChrome.css && ! -f "${TARGET_DIR}"/customChrome.css.bak ]] && cp -r "${TARGET_DIR}"/customChrome.css "${TARGET_DIR}"/customChrome.css.bak
+  [[ -f "${TARGET_DIR}"/userChrome.css && ! -f "${TARGET_DIR}"/userChrome.css.bak ]] && cp -r "${TARGET_DIR}"/userChrome.css "${TARGET_DIR}"/userChrome.css.bak
+  [[ -f "${TARGET_DIR}"/userContent.css && ! -f "${TARGET_DIR}"/userContent.css.bak ]] && cp -r "${TARGET_DIR}"/userContent.css "${TARGET_DIR}"/userContent.css.bak
+
+  rm -rf "${TARGET_DIR}/${THEME_NAME}"
+  rm -rf "${TARGET_DIR}"/customChrome.css
+  rm -rf "${TARGET_DIR}"/userChrome.css
+  rm -rf "${TARGET_DIR}"/userContent.css
 }
 
 ###############################################################################
diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css
index e05538d7..cc3c6fe3 100644
--- a/src/other/firefox/WhiteSur/parts/tabsbar.css
+++ b/src/other/firefox/WhiteSur/parts/tabsbar.css
@@ -62,6 +62,21 @@
 	border-image: none !important;
 }
 
+/* Tabs separators */
+.tabbrowser-tab {
+	border-width: 1px !important;
+	border-left: 1px solid transparent !important;
+}
+
+.tabbrowser-tab + .tabbrowser-tab:not([selected], :hover) {
+	border-color: var(--gnome-toolbar-border-color) !important;
+}
+
+.tabbrowser-tab[selected] + .tabbrowser-tab,
+.tabbrowser-tab:hover + .tabbrowser-tab {
+	border-color: transparent !important;
+}
+
 /* Space between tabs */
 .tabbrowser-tab:not([pinned=true]) {
 	margin: 0 !important;