Fix: Centered - Replace centered options

- `userChrome.tab.centered_content` -> `userChrome.centered.tab`
- `userChrome.tab.centered_label` -> `userChrome.centered.tab.label`
- `userChrome.bookmarkbar.centered` -> `userChrome.centered.bookmarkbar`

css/leptonChrome.css

@@ -6372,52 +6372,6 @@
     display: none !important;
   }
 }
-/*= Tab Centered - Make to Center ============================================*/
-@supports -moz-bool-pref("userChrome.tab.centered_content") or -moz-bool-pref("userChrome.tab.centered_label") {
-  .tabbrowser-tab[selected]:not(:hover) .tab-label-container:not([textoverflow]),
-  .tabbrowser-tab:not(:hover, [pinned]) .tab-label-container:not([textoverflow]) {
-    margin-inline-end: 5px;
-  }
-
-  @supports -moz-bool-pref("userChrome.tab.close_button_at_hover") {
-    #tabbrowser-tabs[closebuttons="activetab"]
-      .tabbrowser-tab:not(:hover, [pinned])
-      .tab-label-container:not([textoverflow]) {
-      margin-inline-end: 1px;
-    }
-
-    #tabbrowser-tabs[closebuttons="activetab"]
-      .tabbrowser-tab:not([selected]):not(:hover, [pinned])
-      .tab-label-container
-      label {
-      padding-inline-end: 18px;
-    }
-  }
-}
-@supports -moz-bool-pref("userChrome.tab.centered_content") {
-  .tab-icon-stack {
-    -moz-box-flex: 1;
-    justify-content: end;
-  }
-}
-@supports -moz-bool-pref("userChrome.tab.centered_label") {
-  /* Based on https://github.com/MrOtherGuy/firefox-csshacks/blob/master/chrome/centered_tab_label.css */
-  .tab-label-container {
-    display: grid;
-    justify-content: safe center;
-    align-items: safe center;
-  }
-
-  .tab-label,
-  .tab-secondary-label {
-    overflow: hidden;
-  }
-
-  .tabbrowser-tab[selected]:not(:hover) .tab-label-container:not([textoverflow]),
-  .tabbrowser-tab:not(:hover, [pinned]) .tab-label-container:not([textoverflow]) {
-    margin-inline-end: 5px;
-  }
-}
 /** Url View UI ***************************************************************/
 /*= Url View - Move icon to left =============================================*/
 @supports -moz-bool-pref("userChrome.urlView.move_icon_to_left") {
@@ -6539,14 +6493,6 @@
     }
   }
 }
-/** Other UI ******************************************************************/
-/*= Bookmark Bar - Centered ==================================================*/
-@supports -moz-bool-pref("userChrome.bookmarkbar.centered") {
-  #PlacesToolbarItems {
-    display: flex !important;
-    justify-content: safe center !important;
-  }
-}
 /** Fullscreen - Overlap toolbar **********************************************/
 @supports -moz-bool-pref("userChrome.fullscreen.overlap") {
   @supports -moz-bool-pref("browser.fullscreen.autohide") {
@@ -6577,6 +6523,60 @@
     /* Makes the bookmarks toolbar visible if enabled */
   }
 }
+/** Centered ******************************************************************/
+/*= Centered - Tab ===========================================================*/
+@supports -moz-bool-pref("userChrome.centered.tab") {
+  .tabbrowser-tab[selected]:not(:hover) .tab-label-container:not([textoverflow]),
+  .tabbrowser-tab:not(:hover, [pinned]) .tab-label-container:not([textoverflow]) {
+    margin-inline-end: 5px;
+  }
+
+  @supports -moz-bool-pref("userChrome.tab.close_button_at_hover") {
+    #tabbrowser-tabs[closebuttons="activetab"]
+      .tabbrowser-tab:not(:hover, [pinned])
+      .tab-label-container:not([textoverflow]) {
+      margin-inline-end: 1px;
+    }
+
+    #tabbrowser-tabs[closebuttons="activetab"]
+      .tabbrowser-tab:not([selected]):not(:hover, [pinned])
+      .tab-label-container
+      label {
+      padding-inline-end: 18px;
+    }
+  }
+  @supports not -moz-bool-pref("userChrome.centered.tab.label") {
+    .tab-icon-stack {
+      -moz-box-flex: 1;
+      justify-content: end;
+    }
+  }
+  @supports -moz-bool-pref("userChrome.centered.tab.label") {
+    /* Based on https://github.com/MrOtherGuy/firefox-csshacks/blob/master/chrome/centered_tab_label.css */
+    .tab-label-container {
+      display: grid;
+      justify-content: safe center;
+      align-items: safe center;
+    }
+
+    .tab-label,
+    .tab-secondary-label {
+      overflow: hidden;
+    }
+
+    .tabbrowser-tab[selected]:not(:hover) .tab-label-container:not([textoverflow]),
+    .tabbrowser-tab:not(:hover, [pinned]) .tab-label-container:not([textoverflow]) {
+      margin-inline-end: 5px;
+    }
+  }
+}
+/*= Centered - Bookmark Bar ==================================================*/
+@supports -moz-bool-pref("userChrome.centered.bookmarkbar") {
+  #PlacesToolbarItems {
+    display: flex !important;
+    justify-content: safe center !important;
+  }
+}
 /** Auto Hide *****************************************************************/
 @supports -moz-bool-pref("userChrome.autohide.back_button") {
   #back-button[disabled="true"] {

src/centered/_index.scss

@@ -0,0 +1,7 @@
+/*= Centered - Tab ===========================================================*/
+@import "tab";
+
+/*= Centered - Bookmark Bar ==================================================*/
+@include Option("userChrome.centered.bookmarkbar") {
+  @import "bookmarkbar";
+}

src/centered/_tab.scss

@@ -0,0 +1,10 @@
+@include Option("userChrome.centered.tab") {
+  @import "tab/layout";
+
+  @include NotOption("userChrome.centered.tab.label") {
+    @import "tab/content";
+  }
+  @include Option("userChrome.centered.tab.label") {
+    @import "tab/label";
+  }
+}

src/leptonChrome.scss

@@ -75,12 +75,12 @@
 /** Sidebar UI ****************************************************************/
 @import "sidebar/index";
 
-/** Other UI ******************************************************************/
-@import "others/index";
-
 /** Fullscreen - Overlap toolbar **********************************************/
 @import "fullscreen/index";
 
+/** Centered ******************************************************************/
+@import "centered/index";
+
 /** Auto Hide *****************************************************************/
 @import "autohide/index";
 

src/others/_index.scss

@@ -1,4 +0,0 @@
-/*= Bookmark Bar - Centered ==================================================*/
-@include Option("userChrome.bookmarkbar.centered") {
-  @import "centered_bookmarkbar";
-}

src/tab/_centered.scss

@@ -1,10 +0,0 @@
-@include Option("userChrome.tab.centered_content", "userChrome.tab.centered_label") {
-  @import "centered/layout";
-}
-
-@include Option("userChrome.tab.centered_content") {
-  @import "centered/content";
-}
-@include Option("userChrome.tab.centered_label") {
-  @import "centered/label";
-}

src/tab/_index.scss

@@ -39,6 +39,3 @@
 @include Option("userChrome.tab.crashed") {
   @import "crashed_tab";
 }
-
-/*= Tab Centered - Make to Center ============================================*/
-@import "centered";

user.js

@@ -93,6 +93,10 @@ user_pref("userChrome.rounding.square_tab",           false);
 // user_pref("userChrome.hidden.selected_tab",                 true);
 // user_pref("userChrome.hidden.disabled_menu",                true);
 
+// user_pref("userChrome.centered.tab",                        true);
+// user_pref("userChrome.centered.tab.label",                  true);
+// user_pref("userChrome.centered.bookmarkbar",                true);
+
 // user_pref("userChrome.rounding.square_button",              true);
 // user_pref("userChrome.rounding.square_panel",               true);
 // user_pref("userChrome.rounding.square_panelitem",           true);
@@ -130,10 +134,6 @@ user_pref("userChrome.rounding.square_tab",           false);
 // user_pref("userChrome.tab.close_button_at_pinned.background", true);
 // user_pref("userChrome.tab.close_button_at_hover.always",    true); // Need close_button_at_hover
 // user_pref("userChrome.tab.sound_show_label",                true); // Need remove sound_hide_label
-// user_pref("userChrome.tab.centered_content",                true);
-// user_pref("userChrome.tab.centered_label",                  true);
-
-// user_pref("userChrome.bookmarkbar.centered",                true);
 
 // user_pref("userChrome.panel.remove_strip",                  true);
 // user_pref("userChrome.panel.full_width_separator",          true);