Bug 1939917 - Update Sidebar visibility settings and settings order r…

…=sidebar-reviewers,fluent-reviewers,desktop-theme-reviewers,bolsson,sclements,hjones

- change order of settings as per spec
- only show visibilty settings if vertical tabs enabled

Depends on D234592

Differential Revision: https://phabricator.services.mozilla.com/D235178

UltraBlame original commit: 935aaee05e8618c18b5e1c9a5ab95fe0337a42b9

browser/components/sidebar/SidebarState.sys.mjs

@@ -1319,6 +1319,9 @@ launcherExpanded
 lazy
 .
 verticalTabsEnabled
+&
+&
+visible
 ;
 if
 (

browser/components/sidebar/browser-sidebar.js

@@ -8637,12 +8637,6 @@ uninitializing
 {
 SidebarController
 .
-updateToolbarButton
-(
-)
-;
-SidebarController
-.
 recordVisibilitySetting
 (
 newValue
@@ -8685,6 +8679,12 @@ SidebarController
 sidebarVerticalTabsEnabled
 )
 ;
+SidebarController
+.
+updateToolbarButton
+(
+)
+;
 }
 }
 )
@@ -8719,6 +8719,13 @@ SidebarController
 uninitializing
 )
 {
+SidebarController
+.
+recordTabsLayoutSetting
+(
+newValue
+)
+;
 Services
 .
 prefs
@@ -8743,13 +8750,6 @@ sidebar
 "
 )
 ;
-SidebarController
-.
-recordTabsLayoutSetting
-(
-newValue
-)
-;
 }
 }
 )

browser/components/sidebar/sidebar-customize.css

@@ -109,6 +109,29 @@ medium
 }
 }
 .
+medium
+-
+top
+-
+margin
+{
+margin
+-
+block
+-
+start
+:
+var
+(
+-
+-
+space
+-
+medium
+)
+;
+}
+.
 customize
 -
 header
@@ -430,11 +453,6 @@ bold
 }
 moz
 -
-radio
--
-group
-moz
--
 fieldset
 {
 display
@@ -526,9 +544,6 @@ medium
 }
 moz
 -
-radio
-moz
--
 checkbox
 {
 padding
@@ -576,6 +591,40 @@ color
 )
 ;
 }
+>
+moz
+-
+checkbox
+:
+last
+-
+of
+-
+type
+{
+padding
+-
+block
+:
+0
+;
+}
+}
+.
+no
+-
+label
+:
+:
+part
+(
+label
+)
+{
+display
+:
+none
+;
 }
 #
 manage
@@ -623,6 +672,16 @@ medium
 customize
 -
 group
+:
+not
+(
+.
+no
+-
+end
+-
+margin
+)
 {
 margin
 -