Remove unused CSS files related to Zen theme

src/browser/base/content/zen-assets.inc.xhtml

@@ -1,6 +1,13 @@
 <!-- Styles used all over the browser -->
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-theme.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-animations.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-tabs.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-browser-ui.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-panel-ui.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-single-components.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-floating-urlbar.css" />
+
+<link rel="stylesheet" type="text/css" href="chrome://browser/skin/zen-icons/icons.css" />
 
 <!-- Scripts used all over the browser -->
 <script type="text/javascript">

src/browser/base/content/zen-assets.jar.inc.mn

@@ -11,5 +11,9 @@
         
         content/browser/zen-styles/zen-theme.css                (content/zen-styles/zen-theme.css)
         content/browser/zen-styles/zen-tabs.css                 (content/zen-styles/zen-tabs.css)
-        content/browser/zen-styles/zen-tabs/horizontal.css      (content/zen-styles/zen-tabs/horizontal.css)
-        content/browser/zen-styles/zen-tabs/vertical.css        (content/zen-styles/zen-tabs/vertical.css)
+        content/browser/zen-styles/zen-tabs/vertical-tabs.css   (content/zen-styles/zen-tabs/vertical-tabs.css)
+        content/browser/zen-styles/zen-browser-ui.css           (content/zen-styles/zen-browser-ui.css)
+        content/browser/zen-styles/zen-animations.css           (content/zen-styles/zen-animations.css)
+        content/browser/zen-styles/zen-panel-ui.css             (content/zen-styles/zen-panel-ui.css)
+        content/browser/zen-styles/zen-single-components.css     (content/zen-styles/zen-single-components.css)
+        content/browser/zen-styles/zen-floating-urlbar.css      (content/zen-styles/zen-floating-urlbar.css)

src/browser/base/content/zen-styles/zen-animations.css

@@ -0,0 +1,57 @@
+
+@keyframes zen-jello-animation {
+  0% {
+    transform: scale3d(0.8, 0.8, 0.8);
+  }
+
+  60% {
+    transform: scale3d(1.02, 1.02, 1.02);
+  }
+
+  to {
+    opacity: 1;
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+@keyframes zen-jello-out-animation {
+  0% {
+    transform: scale3d(1, 1, 1);
+  }
+
+  60% {
+    transform: scale3d(1.02, 1.02, 1.02);
+  }
+
+  99% {
+    opacity: 0;
+    transform: scale3d(0.8, 0.8, 0.8);
+  }
+
+  100% {
+    -moz-window-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes zen-slide-in {
+  from {
+    transform: translateX(-10px);
+    opacity: 0;
+  }
+  to {
+    transform: translateX(0);
+    opacity: 1;
+  }
+}
+
+@keyframes zen-zoom-in {
+  from {
+    transform: scale(0.5);
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
+}

src/browser/base/content/zen-styles/zen-browser-ui.css

@@ -0,0 +1,32 @@
+
+toolbox#navigator-toolbox, 
+#browser {
+  background: transparent !important;
+}
+
+#browser {
+  width: 100%;
+}
+
+html#main-window > body {
+  background: var(--zen-main-browser-background) !important;
+}
+
+:not([inDOMFullscreen="true"]) #appcontent {
+  overflow: hidden;
+}
+
+#appcontent {
+  background: var(--toolbar-bgcolor);
+}
+
+:not([inDOMFullscreen="true"]) #appcontent,
+#sidebar-box {
+  /** Sidebar is already hidden in full screen mode */
+  box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;
+  border: none;
+}
+
+#zen-main-app-wrapper {
+  background: var(--zen-main-browser-background);
+}

src/browser/base/content/zen-styles/zen-floating-urlbar.css

@@ -0,0 +1,45 @@
+@media (-moz-bool-pref: "zen.theme.floating-urlbar") {
+  #urlbar:is([breakout][breakout-extend], [breakout][usertyping][focused]) {
+    #urlbar-input {
+      font-size: 16px !important;
+    }
+    
+    z-index: 2;
+    position: fixed !important;
+    bottom: auto !important;
+    top: 20vh !important;
+    padding-left: 6px !important;
+    padding-right: 8px !important;
+    
+    left: 18vw !important;
+    right: 18vw !important;
+    width: 64vw !important;
+
+    &:after {
+      content: "";
+      position: fixed;
+      pointer-events: none;
+      
+      width: 100vw;
+      height: 100vh;
+      
+      top: 0px;
+      left: 0px;
+      
+      background-color: rgba(0, 0, 0, 0.3);
+      backdrop-filter: blur(5px);
+
+      z-index: -1;
+    }
+
+    #identity-box {
+      margin: auto 0;
+      height: 30px;
+      margin-right: 10px;
+    }
+
+    .urlbar-go-button {
+      margin: auto 0;
+    }
+  }
+}

src/browser/base/content/zen-styles/zen-panel-ui.css

@@ -0,0 +1,8 @@
+
+panel[type="arrow"][animate][animate="open"] {
+  animation: zen-jello-animation 0.2s ease-in-out;
+}
+
+panel[type="arrow"][animate][animate="cancel"] {
+  animation: zen-jello-out-animation 0.2s ease-in-out;
+}

src/browser/base/content/zen-styles/zen-single-components.css

@@ -0,0 +1,50 @@
+/* Screenshots */
+
+#screenshotsPagePanel {
+  position: absolute !important;
+  top: 3%;
+  right: 1.5%;
+}
+
+/* Watermark */
+
+#zen-watermark {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: var(--zen-main-browser-background);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+}
+
+#zen-watermark image {
+  opacity: .2;
+  filter: grayscale(100%);
+  width: 200px;
+  height: 200px;
+}
+
+#zen-watermark[hidden="true"] {
+  transition: 0.6s;
+  transition-delay: .5s;
+  opacity: 0;
+  pointer-events: none;
+}
+
+#zen-workspaces-button .zen-workspace-sidebar-name {
+  margin-left: 10px;
+  display: none;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+@media not (-moz-bool-pref: "zen.watermark.enabled") {
+  #zen-watermark {
+    display: none;
+  }
+}

src/browser/base/content/zen-styles/zen-tabs.css

@@ -1,4 +1,4 @@
 
 /* Styles for both vertical and horizontal tabs */
-@import url("chrome://browser/content/zen-styles/zen-tabs/horizontal-tabs.css");
+/*@import url("chrome://browser/content/zen-styles/zen-tabs/horizontal-tabs.css");*/
 @import url("chrome://browser/content/zen-styles/zen-tabs/vertical-tabs.css");

src/browser/base/content/zen-styles/zen-tabs/horizontal-tabs.css

@@ -1,2 +0,0 @@
-
-/* TODO: */

src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css

@@ -0,0 +1,409 @@
+
+@media (-moz-bool-pref: "zen.tabs.vertical") {
+  #titlebar {
+    height: 100%;
+  }
+  
+  #navigator-toolbox {
+    min-width: 55px;
+    margin-top: 0; /* Issue #156 */
+  }
+  
+  :root[inFullscreen="true"] #navigator-toolbox {
+    display: none;
+  }
+  
+  #zen-tabbox-wrapper:has(#zen-sidebar-splitter:not([state="dragging"])) #navigator-toolbox {
+    transition: .3s;
+  }
+  
+  #navigator-toolbox toolbar#TabsToolbar {
+    margin: var(--zen-appcontent-separator-from-window);
+    overflow: hidden;
+    transition: .2s;
+    flex-direction: column;
+    padding: 5px 0;
+    margin-right: 0;
+    -moz-window-dragging: no-drag;
+    --zen-sidebar-action-button-width: 38px;
+    padding-bottom: calc(5px + 5px); /* Taking into consideration the padding of the sidebar without being inlined */
+  }
+  
+  #TabsToolbar-customization-target {
+    flex-direction: column;
+  }
+  
+  :root[customizing] .customization-target:not(#widget-overflow-fixed-list) {
+    min-width: 0;
+  }
+  
+  toolbarpaletteitem {
+    justify-content: center;
+  }
+  
+  toolbarbutton#scrollbutton-down,
+  toolbarbutton#scrollbutton-up {
+    display: none;
+  }
+  
+  #toolbar-menubar {
+    display: none;
+  }
+  
+  .tab-label-container {
+    display: none;
+  }
+  
+  .tab-icon-stack > .tab-icon-image,
+  .tab-icon-stack > .tab-throbber {
+    width: var(--zen-browser-tab-icon-size);
+    height: var(--zen-browser-tab-icon-size);
+    margin-inline-end: 0;
+  }
+  
+  .tab-icon-stack .tab-icon-image {
+    transform: scale(0.5);
+    opacity: 0;
+    animation: zen-zoom-in 0.12s ease-in-out 0.3s forwards;
+  }
+  
+  .tab-background {
+    display: none;
+  }
+  
+  .tabbrowser-tab {
+    --zen-browser-tab-icon-size: 18px;
+    --tab-min-width: 36px;
+    margin: 0 auto;
+    border-radius: 8px;
+    position: relative;
+    color-scheme: var(--tab-selected-color-scheme);
+    border: 2px solid transparent;
+    background: transparent;
+    padding: 0;
+    align-items: center;
+    min-height: var(--tab-min-width); /* Make a box */
+    animation: zen-slide-in 0.3s;
+    width: calc(var(--zen-browser-tab-icon-size) + 2px);
+    transition: .1s background, .1s border-color;
+    min-width: var(--tab-min-width);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  
+  @media (-moz-bool-pref: "zen.tabs.dim-pending") {
+    .tabbrowser-tab[pending]:not(:hover) {
+      opacity: 0.5;
+    }
+  }
+  
+  .tabbrowser-tab[hidden="true"] {
+    display: none;
+  }
+  
+  .tabbrowser-tab:hover {
+    background: var(--toolbarbutton-hover-background);
+  }
+  
+  .tabbrowser-tab:active,
+  .zen-sidebar-panel-button:active {
+    transform: scale(0.9);
+  }
+  
+  .tab-stack {
+    width: 30px;
+    height: 30px;
+    min-width: 30px;
+    min-height: 30px;
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .tabbrowser-tab:not([fadein]) {
+    display: none;
+  }
+  
+  .tabbrowser-tab:is([multiselected="true"], [selected]) {
+    background: var(--toolbarbutton-hover-background);
+  }
+  
+  #private-browsing-indicator-with-label {
+    display: none;
+  }
+  
+  .tabbrowser-tab::after {/* Containers */
+    background: var(--identity-tab-color, transparent);
+    border-radius: 2px;
+    height: 80%;
+    width: 2px;
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    left: -2px;
+    content: '';
+    pointer-events: none;
+  }
+  
+  .tabbrowser-tab {
+    margin-inline-start: 0;
+    margin: 0 auto;
+  }
+  
+  .tabbrowser-tab[pinned] {
+    position: relative;
+    display: flex;
+  }
+  
+  #tabbrowser-tabs:has(.tabbrowser-tab[pinned]) .tabbrowser-tab:nth-child(1 of [fadein]:not([pinned]):not([hidden])) {
+    margin-top: 15px;
+    position: relative;
+    overflow: visible;
+  
+    & .tab-stack::before {
+      content: '';
+      position: absolute;
+      top: -11px;
+      left: 0;
+      width: 100%;
+      height: 1.5px;
+      border-radius: 1px;
+      background: var(--zen-colors-border);
+    }
+  }
+  
+  .tab-close-button {
+    position: absolute;
+    display: none;
+    left: 0;
+    top: 50%;
+  }
+  
+  .tabbrowser-tab[open="true"]:hover .tab-close-button {
+    /* TODO: fix this */
+    /*display: block;*/
+  }
+  
+  .tab-content {
+    padding: 0;
+    width: fit-content;
+  }
+  
+  .toolbar-items > toolbartabstop:first-child {
+    display: none;
+  }
+  
+  #nav-bar > *:not(.titlebar-buttonbox-container) {
+    padding-top: 5px;
+    padding-bottom: 5px;
+  }
+  
+  #TabsToolbar-customization-target {
+    height: 100%;
+  }
+  
+  #tabbrowser-tabs {
+    margin-inline-start: 0;
+    padding-inline-start: 0;
+    border: none;
+    /*background: light-dark(rgba(0,0,0,.05), rgba(255,255,255,.05));*/
+    margin: 0;
+    border: none;
+    height: 100%;
+  }
+  
+  #tabbrowser-arrowscrollbox {
+    margin: 3px 0;
+  }
+  
+  #alltabs-button stack {
+    transform: rotate(-90deg);
+  }
+  
+  .tab-icon-overlay {
+    margin-inline-end: 0;
+    display: none; /* TODO: fix this */
+  }
+
+  @media not (-moz-bool-pref: "zen.view.sidebar-expanded") {
+    #navigator-toolbox {
+      width: fit-content !important;
+    }
+  }
+
+  @media (-moz-bool-pref: "zen.view.sidebar-expanded") {
+    #navigator-toolbox {
+      min-width: calc(var(--zen-navigation-toolbar-min-width) + var(--zen-compact-toolbox-margin-single) * 2) !important;
+    }
+
+    #zen-workspaces-button .zen-workspace-sidebar-name {
+      display: block;
+    }
+  
+    #zen-workspaces-button .zen-workspace-sidebar-icon[no-icon="true"] {
+      display: none;
+    }
+  
+    #zen-workspaces-button .zen-workspace-sidebar-icon[no-icon="true"] + .zen-workspace-sidebar-name {
+      margin-left: 0;
+    }
+  
+    #navigator-toolbox {
+      --zen-navigation-toolbar-min-width: 160px;
+      min-width: var(--zen-navigation-toolbar-min-width);
+      align-items: start;
+      padding-left: 10px;
+      padding-right: 5px;
+      transition: .2s;
+      width: 170px;
+      border: none;
+    }
+  
+    :root:not([inDOMFullscreen="true"]) #zen-sidebar-splitter {
+      display: block;
+      width: 1px;
+    }
+  
+    .tab-label-container {
+      display: block;
+    }
+  
+    #titlebar,
+    #TabsToolbar,
+    #TabsToolbar .toolbar-items {
+      width: 100%;
+      align-items: flex-start;
+    }
+  
+    #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) {
+      width: 100% !important;
+      border-radius: 8px;
+    }
+  
+    #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button):hover {
+      background: var(--button-hover-bgcolor);
+    }
+  
+    #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-text,
+    #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-icon,
+    #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-badge-stack {
+      background: transparent !important;
+    }
+  
+    #tabbrowser-arrowscrollbox-periphery {
+      margin-top: 5px;
+    }
+  
+    #tabbrowser-arrowscrollbox-periphery > toolbarbutton {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  
+    .tabbrowser-tab {
+      max-width: unset !important;
+  
+      &:not([pinned]) {
+        width: 100%;
+      
+        &:hover .tab-close-button {
+          display: block !important;
+        }
+    
+        & .tab-content {
+          position: relative;
+          width: 100%;
+        }
+          
+        & .tab-stack {
+          justify-content: start;
+          padding: 10px;
+          width: 100% !important;
+        }
+  
+        & .tab-label-container {
+      
+          #tabbrowser-tabs:not([secondarytext-unsupported]) & {
+            display: flex;
+            align-items: center;
+            padding-left: 10px;
+          }
+        }
+      }
+  
+      &:active,
+      .zen-sidebar-panel-button:active {
+        transform: scale(0.96) !important;
+      }
+  
+      &[pinned] {
+        margin: 0 !important;
+      }
+    }
+    #tabbrowser-arrowscrollbox::part(scrollbox) {
+      /* We have the pinned tabs on the top, next to each other,
+        * and the rest of the tabs are below them. */
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(var(--tab-min-height), 1fr));
+      padding: 5px;
+    }
+  
+    .tabbrowser-tab:not([pinned]),
+    #tabbrowser-arrowscrollbox-periphery {
+      grid-column: 1 / -1;
+    }
+  
+    .tabbrowser-tab[pinned] {
+      grid-column: span 1;
+      min-width: 100%;
+    }
+  
+    #zen-workspaces-button {
+      overflow: hidden;
+      width: calc(100% - 40px) !important;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      display: flex;
+      padding: 2px 10px;
+    }
+  
+    #zen-sidebar-icons-wrapper {
+      width: 100%;
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(38px, 1fr));
+      transition: .1s;
+    }
+  
+    #zen-sidebar-icons-wrapper::before {
+      width: 100%;
+    }
+  }
+
+  /* Display the vertical tabs on the right side */
+  @media (-moz-bool-pref: "zen.tabs.vertical.right-side") and (not (-moz-bool-pref: "zen.view.compact")) {
+    #navigator-toolbox {
+      order: 4;
+      padding-left: 0;
+    }
+
+    @media (-moz-bool-pref: "zen.view.sidebar-expanded") {
+      #navigator-toolbox {
+        padding-left: 5px;
+      }
+    }
+
+    #zen-sidebar-splitter {
+      order: 3;
+    }
+
+    #tabbrowser-tabbox {
+      padding-left: 10px;
+    }
+
+    #tabbrowser-tabpanels .browserSidebarContainer {
+      margin-right: 0 !important;
+    }
+  }
+}

src/browser/base/content/zen-styles/zen-theme.css

@@ -78,6 +78,34 @@
 
   /* Constants */
   --zen-element-separation: 1rem;
+
+  /* XUL */
+  --zen-main-browser-background: light-dark(rgb(235, 235, 235), #1b1b1b);
+  --zen-appcontent-border: 1px solid var(--zen-colors-border);
+  --zen-browser-border-radius: var(--zen-panel-radius);
+
+  --toolbarbutton-border-radius: 6px;
+
+  --fp-contextmenu-border-radius: 8px;
+  --fp-contextmenu-padding: calc(4px - var(--fp-contextmenu-menuitem-border-width)) 0;
+  --fp-contextmenu-menuitem-border-radius: calc(4px + var(--fp-contextmenu-menuitem-border-width));
+  --fp-contextmenu-menuitem-padding-block: 6px;
+  --fp-contextmenu-menuitem-padding-inline: 10px;
+  --fp-contextmenu-menuitem-border-width: 2px;
+  --fp-contextmenu-menuicon-margin-inline: 12px;
+  --fp-contextmenu-menuitem-margin-inline: calc(4px - var(--fp-contextmenu-menuitem-border-width));
+  --fp-contextmenu-menuitem-margin-block: 0px;
+  --fp-contextmenu-menuitem-margin: var(--fp-contextmenu-menuitem-margin-block) var(--fp-contextmenu-menuitem-margin-inline);
+  --fp-contextmenu-separator-vertical: calc(4px - var(--fp-contextmenu-menuitem-border-width));
+  --fp-contextmenu-separator-horizontal: 0;
+  --fp-contextmenu-bgcolor: light-dark(Menu, rgb(43 42 51 / 0.95));
+  --toolbar-bgcolor: transparent;
+
+  --input-bgcolor: var(--zen-colors-tertiary);
+  --input-border-color: var(--zen-input-border-color);
+  --zen-themed-toolbar-bg: var(--zen-colors-tertiary);
+
+  --toolbar-field-background-color: var(--zen-colors-input-bg);
 }
 
 @media (prefers-color-scheme: dark) {
@@ -99,4 +127,11 @@
     --zen-dialog-background: color-mix(in srgb, var(--zen-primary-color) 10%, black 90%);
     --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 8%, black 92%); 
   }
-}
+}
+
+@media not (-moz-bool-pref: "zen.theme.toolbar-themed") {
+  :root {
+    --toolbar-bgcolor: light-dark(white, #1b1b1b) !important;
+    --zen-themed-toolbar-bg: var(--toolbar-bgcolor);
+  }
+}

src/browser/themes/shared/browser-shared-css.patch

@@ -1,17 +1,8 @@
 diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index f2171eb033a1143870f4708c63f565fabb535c4b..a21631e56e74d5d1887554d2752a612887ed20c5 100644
+index f2171eb033a1143870f4708c63f565fabb535c4b..4280bc4b0f7cdbd94179fa2111f8001a331ea42b 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
-@@ -73,7 +76,7 @@ body {
-   --short-notification-gradient: #9059FF;
- 
-   --button-bgcolor: color-mix(in srgb, currentColor 13%, transparent);
--  --button-hover-bgcolor: color-mix(in srgb, currentColor 17%, transparent);
-+  --button-hover-bgcolor: color-mix(in srgb, currentColor 15%, transparent);
-   --button-active-bgcolor: color-mix(in srgb, currentColor 30%, transparent);
-   --button-color: currentColor;
-   --button-primary-bgcolor: AccentColor;
-@@ -179,7 +182,6 @@ body {
+@@ -179,7 +179,6 @@ body {
    appearance: none;
  
    /* Toolbar / content area border */
@@ -19,7 +10,7 @@ index f2171eb033a1143870f4708c63f565fabb535c4b..a21631e56e74d5d1887554d2752a6128
  
    background-color: var(--toolbox-non-lwt-bgcolor);
    color: var(--toolbox-non-lwt-textcolor);
-@@ -188,37 +190,13 @@ body {
+@@ -188,7 +187,6 @@ body {
    transition: background-color var(--inactive-window-transition);
  
    &:-moz-window-inactive {
@@ -27,34 +18,35 @@ index f2171eb033a1143870f4708c63f565fabb535c4b..a21631e56e74d5d1887554d2752a6128
      color: var(--toolbox-non-lwt-textcolor-inactive);
    }
  
-   &[fullscreenShouldAnimate] {
+@@ -196,6 +194,31 @@ body {
      transition: 0.8s margin-top ease-out;
    }
--
--  :root[customizing] & {
--    border-bottom-style: none;
--  }
--
--  :root[lwtheme] & {
--    background-image: var(--lwt-additional-images);
--    background-repeat: var(--lwt-background-tiling);
--    background-position: var(--lwt-background-alignment);
--    background-color: var(--lwt-accent-color);
--    color: inherit;
--
--    &:-moz-window-inactive {
--      background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
--    }
--  }
--
--  /* When a theme defines both theme_frame and additional_backgrounds, show
--     the latter atop the former. */
--  :root[lwtheme-image] & {
--    background-image: var(--lwt-header-image), var(--lwt-additional-images);
--    background-repeat: no-repeat, var(--lwt-background-tiling);
--    background-position: right top, var(--lwt-background-alignment);
--  }
-+  
- }
  
- .browser-toolbar {
++
++  :root[customizing] & {
++    border-bottom-style: none;
++  }
++
++  :root[lwtheme] & {
++    background-image: var(--lwt-additional-images);
++    background-repeat: var(--lwt-background-tiling);
++    background-position: var(--lwt-background-alignment);
++    background-color: var(--lwt-accent-color);
++    color: inherit;
++
++    &:-moz-window-inactive {
++      background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
++    }
++  }
++
++  /* When a theme defines both theme_frame and additional_backgrounds, show
++     the latter atop the former. */
++  :root[lwtheme-image] & {
++    background-image: var(--lwt-header-image), var(--lwt-additional-images);
++    background-repeat: no-repeat, var(--lwt-background-tiling);
++    background-position: right top, var(--lwt-background-alignment);
++  }
++  
+   :root[customizing] & {
+     border-bottom-style: none;
+   }

src/toolkit/content/xul-css.patch

@@ -1,8 +1,8 @@
 diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
-index 908132d598083dd43ee62940f4bac84e49238c92..eb7edf3870032fe796b3fa676de96e1dbb5eea85 100644
+index 26c11188d3edcc9806fab7144aa0e22540a32a57..df3dbca06ede3eda1854febe314c38779f754c03 100644
 --- a/toolkit/content/xul.css
 +++ b/toolkit/content/xul.css
-@@ -485,7 +487,8 @@ deck > *|*:not(:-moz-native-anonymous) {
+@@ -485,7 +485,8 @@ deck > *|*:not(:-moz-native-anonymous) {
  }
  
  tabpanels > .deck-selected,

src/toolkit/themes/shared/desktop-jar-inc-mn.patch

@@ -1,11 +0,0 @@
-diff --git a/toolkit/themes/shared/desktop-jar.inc.mn b/toolkit/themes/shared/desktop-jar.inc.mn
-index 5907a9773fe608520b0088c1fc40c23a7003530f..535a7fae17f295a3bc97cf807d9c9dd496ec2352 100644
---- a/toolkit/themes/shared/desktop-jar.inc.mn
-+++ b/toolkit/themes/shared/desktop-jar.inc.mn
-@@ -162,3 +162,5 @@
-   skin/classic/global/reader/content-width-20.svg          (../../shared/reader/content-width-20.svg)
-   skin/classic/global/tree/sort-asc.svg                    (../../shared/tree/sort-asc.svg)
-   skin/classic/global/tree/sort-dsc.svg                    (../../shared/tree/sort-dsc.svg)
-+
-+#include zen-desktop.jar.inc.mn
-\ No newline at end of file

src/toolkit/themes/shared/in-content/common-shared-css.patch

@@ -1,8 +1,8 @@
 diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes/shared/in-content/common-shared.css
-index 2b59a0604b4bfefd3bdcfdb9a3964937e9699114..92705331fa12d88e9091310c1f527562931e7132 100644
+index 2b59a0604b4bfefd3bdcfdb9a3964937e9699114..95a656fad02888ba86f618977855644195ebc64a 100644
 --- a/toolkit/themes/shared/in-content/common-shared.css
 +++ b/toolkit/themes/shared/in-content/common-shared.css
-@@ -63,7 +65,7 @@
+@@ -63,7 +63,7 @@
    --in-content-table-border-color: var(--in-content-box-border-color);
    --in-content-table-header-background: var(--in-content-primary-button-background);
    --in-content-table-header-color: var(--in-content-primary-button-text-color);
@@ -11,7 +11,7 @@ index 2b59a0604b4bfefd3bdcfdb9a3964937e9699114..92705331fa12d88e9091310c1f527562
  
    --dialog-warning-text-color: var(--red-60);
  
-@@ -791,7 +793,8 @@ html|*#categories > html|*.category:dir(rtl) {
+@@ -791,7 +791,8 @@ html|*#categories > html|*.category:dir(rtl) {
  @media not (forced-colors) {
    #categories > .category[selected],
    #categories > .category.selected {

src/toolkit/themes/shared/popup-css.patch

@@ -1,30 +1,8 @@
 diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
-index ed230860215c734e6fb903b3660d0c679043e3f3..348436a56cecdf101da66cdec9d64f1bb851ba4d 100644
+index ed230860215c734e6fb903b3660d0c679043e3f3..1e54e023c930db04a532b2b125f44e73912f63ad 100644
 --- a/toolkit/themes/shared/popup.css
 +++ b/toolkit/themes/shared/popup.css
-@@ -13,16 +15,16 @@ panel {
-   color-scheme: light dark;
- 
-   min-width: 1px;
--  --panel-background: Menu;
-+  --panel-background: var(--arrowpanel-background);
-   --panel-color: MenuText;
-   --panel-padding-block: 4px;
--  --panel-padding: var(--panel-padding-block) 0;
--  --panel-border-radius: 4px;
--  --panel-border-color: ThreeDShadow;
-+  --panel-padding: var(--panel-padding-block) 0 5px 0;
-+  --panel-border-radius: 10px;
-+  --panel-border-color: transparent /* var(--arrowpanel-border-color) */ !important;
-   --panel-width: initial;
- 
-   --panel-shadow-margin: 0px;
--  --panel-shadow: 0 0 var(--panel-shadow-margin) hsla(0,0%,0%,.2);
-+  --panel-shadow: rgba(0, 0, 0, 0.05) 0px 4px 10px;
-   -moz-window-input-region-margin: var(--panel-shadow-margin);
-   margin: calc(-1 * var(--panel-shadow-margin));
- 
-@@ -30,8 +32,6 @@ panel {
+@@ -30,8 +30,6 @@ panel {
    --background-color-canvas: var(--panel-background);
  
    @media (-moz-platform: linux) {
@@ -33,7 +11,7 @@ index ed230860215c734e6fb903b3660d0c679043e3f3..348436a56cecdf101da66cdec9d64f1b
  
      @media (prefers-contrast) {
        --panel-border-color: color-mix(in srgb, currentColor 60%, transparent);
-@@ -43,18 +43,7 @@ panel {
+@@ -43,18 +41,7 @@ panel {
      --panel-shadow-margin: 4px;
    }
  
@@ -53,7 +31,7 @@ index ed230860215c734e6fb903b3660d0c679043e3f3..348436a56cecdf101da66cdec9d64f1b
  
    &::part(content) {
      display: flex;
-@@ -193,6 +182,6 @@ panel[type="arrow"] {
+@@ -193,6 +180,6 @@ panel[type="arrow"] {
    }
  
    &[animating] {

src/toolkit/themes/shared/zen-desktop.jar.inc.mn

@@ -1,5 +0,0 @@
-  skin/classic/global/in-content/zen-common-shared.css               (../../shared/in-content/zen-common-shared.css)
-  skin/classic/global/zen-global-shared.css                    (../../shared/zen-global-shared.css)
-  skin/classic/global/zen-popup.css                            (../../shared/zen-popup.css)
-  skin/classic/global/in-content/zen-common-shared-ui-override.css        (../../shared/in-content/zen-common-shared-ui-override.css)
-