From b080247064db75dfb97854c78dc69f92af7dffe8 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 30 May 2021 22:31:14 +0800
Subject: [PATCH] update

---
 lib-install.sh                               |  5 +-
 src/other/firefox/WhiteSur/parts/tabsbar.css | 79 ++++++++++----------
 2 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/lib-install.sh b/lib-install.sh
index 85e982d..8c4f6ff 100755
--- a/lib-install.sh
+++ b/lib-install.sh
@@ -485,11 +485,8 @@ edit_firefox_theme_prefs() {
 }
 
 remove_firefox_theme() {
-  # We need to remove this linked folder to avoid unwanted file overriding in
-  # the next installation
   rm -rf "${FIREFOX_DIR_HOME}/"*"default"*"/chrome"
-  rm -rf "${FIREFOX_THEME_DIR}" # Sorry, we need to remove ".../WhiteSur" to keep anything clean
-  # This too
+  rm -rf "${FIREFOX_THEME_DIR}"
   rm -rf "${FIREFOX_FLATPAK_DIR_HOME}/"*"default"*"/chrome"
   rm -rf "${FIREFOX_FLATPAK_THEME_DIR}"
 }
diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css
index b2ad2f9..00cd743 100644
--- a/src/other/firefox/WhiteSur/parts/tabsbar.css
+++ b/src/other/firefox/WhiteSur/parts/tabsbar.css
@@ -127,7 +127,6 @@ tab[selected]:-moz-window-inactive {
 }
 
 /* If tab favicon is not present, force tab label to the center */
-
 .tabbrowser-tab .tab-label-container {
 	margin-left: 0 !important;
 }
@@ -135,6 +134,7 @@ tab[selected]:-moz-window-inactive {
 .tabbrowser-tab:not([image]):not([busy]):not([progress]) .tab-label-container {
 	margin-left: auto !important;
 }
+
 /* If tab close button is not present, don't force favicon to the center */
 #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]) .tab-throbber,
 #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]) .tab-throbber-fallback,
@@ -144,6 +144,45 @@ tab[selected]:-moz-window-inactive {
 	margin-left: 0 !important;
 }
 
+/* Fix website with no favicon centred text */
+.tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]) .tab-icon-stack {
+	margin-left: 0 !important
+}
+
+.tabbrowser-tab:not([image], [busy]) .tab-icon-stack {
+	margin-left: 0 !important
+}
+
+@media (-moz-proton) {
+
+	/* Firefox v89 beta tab fix */
+	.tab-background {
+		border-radius: 0 !important;
+		margin-block: 0 !important;
+	}
+
+	/*Align personal bookmarks v89 */
+	#personal-bookmarks {
+		-moz-box-align: center !important;
+	}
+
+	/* fix misc spacing between tabs */
+	.tabbrowser-tab {
+		padding-inline: 0px !important;
+	}
+
+	.tabbrowser-tab[selected="true"]>.tab-stack>.tab-background {
+		margin-left: 0px !important;
+		margin-right: 0px !important;
+	}
+
+	/* centre text when audio is playing */
+	.tabbrowser-tab:is([soundplaying]) .tab-label-container {
+		margin-left: 0 !important;
+		margin-right: auto !important
+	}
+}
+
 /* Remove tab icons */
 /* tab:not([pinned=true]) .tab-icon-image {
 	display: none;
@@ -332,41 +371,3 @@ tab[selected]:-moz-window-inactive {
 #tabbrowser-tabs[closebuttons="activetab"]>#tabbrowser-arrowscrollbox>.tabbrowser-tab>.tab-stack>.tab-content>.tab-icon-stack[selected="true"] {
 	margin-left: auto !important;
 }
-
-/* Fix website with no favicon centred text */
-.tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]) .tab-icon-stack {
-	margin-left: 0 !important
-}
-
-.tabbrowser-tab:not([image]) .tab-icon-stack {
-	margin-left: 0 !important
-}
-@media (-moz-proton) {
-
-	/* Firefox v89 beta tab fix */
-	.tab-background {
-		border-radius: 0 !important;
-		margin-block: 0 !important;
-	}
-
-	/*Align personal bookmarks v89 */
-	#personal-bookmarks {
-		-moz-box-align: center !important;
-	}
-
-	/* fix misc spacing between tabs */
-	.tabbrowser-tab {
-		padding-inline: 0px !important;
-	}
-
-	.tabbrowser-tab[selected="true"]>.tab-stack>.tab-background {
-		margin-left: 0px !important;
-		margin-right: 0px !important;
-	}
-
-	/* centre text when audio is playing */
-	.tabbrowser-tab:is([soundplaying]) .tab-label-container {
-		margin-left: 0 !important;
-		margin-right: auto !important
-	}
-}