fix: fix merged code

christorange · Nov 17, 2023 · 0792635 · 0792635
1 parent 6d92ec3
commit 0792635
Showing 1 changed file with 25 additions and 114 deletions.
diff --git a/windows/userChrome.css b/windows/userChrome.css
@@ -300,7 +300,7 @@ toolbar:not([customizing]) > #nav-bar-customization-target {
    -moz-box-ordinal-group: 1 !important;
 }
 
- @media only screen and (max-width: 670px) {
+@media only screen and (max-width: 670px) {
    #main-window #navigator-toolbox:not([inFullscreen]) #TabsToolbar .titlebar-buttonbox-container {
       visibility: visible !important;
       position: relative !important;
@@ -309,19 +309,35 @@ toolbar:not([customizing]) > #nav-bar-customization-target {
    #main-window #navigator-toolbox:not([inFullscreen]) #nav-bar {
       padding-right: initial !important;
    }
-    #TabsToolbar.browser-toolbar{
-       display: flex !important;
-       justify-content: flex-end !important;
-    }
-
- }
+   #TabsToolbar.browser-toolbar{
+      display: flex !important;
+      justify-content: flex-end !important;
+   }
 
+}
 
-/* menubar bg color */
 #toolbar-menubar{
+   /* menubar bg color */
    background-color: var(--bg) !important;
 }
 
+
+/* Line up the Windows controls with the rest of the icons in the toolbar. */
+:root:not([sizemode="maximized"]) .titlebar-buttonbox-container {
+   padding-top: 3px;
+}
+
+.titlebar-buttonbox {
+   z-index:3 !important;
+   padding-right:3px;
+}
+
+.titlebar-buttonbox * {
+   border-radius: 5px;
+   width:35px;
+   height:38px;
+}
+
 /* SIDEBERY */
 
 /* hides the sidebar header */
@@ -429,109 +445,4 @@ toolbar:not([customizing]) > #nav-bar-customization-target {
 #sidebar-box:not([positionend]):hover ~ #appcontent #statuspanel-label {
 	margin-inline: 0px !important;
 	border-left-style: solid !important;
-}
-
-
-
-/* Windows specific styles */
-@media (-moz-platform: windows),
-       (-moz-platform: windows-win10) {
-    /* Hide main tabs toolbar */
-
-    #nav-bar{
-        border-inline: var(--uc-window-drag-space-width,80px) solid var(--toolbar-bgcolor) ;
-        border-inline-style: solid !important;
-        border-right-width: calc(var(--uc-window-control-width,0px) + var(--uc-window-drag-space-width,0px));
-
-        padding-top: .5px !important; /* This makes it possible to drag the maximized window. */
-        margin-left: -80px; /* Removes the space left when hiding .titlebar-buttonbox-container */
-    }
-
-    #back-button { 
-		margin-top: -.5px !important; 
-	}
-
-	#forward-button { 
-		margin-top: -.5px !important; 
-	}
-
-	#reload-button { 
-		margin-top: -.5px !important; 
-	}
-
-	#PanelUI-button {
-		margin-top: -.5px !important; 
-	}
-
-	#nav-bar-overflow-button{
-		margin-top: -.5px !important; 
-	}
-
-    :root {
-        --uc-toolbar-height: 32px;
-        --chrome-content-separator-color: none !important;
-    }
-
-    :root:not([uidensity="compact"]) {
-        --uc-toolbar-height: 38px;
-    }
-
-    #TabsToolbar {
-        visibility: collapse !important;
-    }
-
-    /* Hide the Windows controls on the left side. */
-    #TabsToolbar .titlebar-buttonbox-container {
-        visibility: hidden !important;
-    }
-    /* Line up the Windows controls with the rest of the icons in the toolbar. */
-    :root:not([sizemode="maximized"]) .titlebar-buttonbox-container {
-        margin-top: 3px;
-    }
-
-
-    :root:not([inFullscreen]) #nav-bar {
-        margin-top: calc(0px - var(--uc-toolbar-height));
-        z-index: 2;
-    }
-
-    #toolbar-menubar {
-        min-height: unset !important;
-        height: var(--uc-toolbar-height) !important;
-        position: relative;
-    }
-
-    /* For a rounded button design, uncomment both lines in .titlebar-buttonbox. */
-    .titlebar-buttonbox {
-        z-index:3 !important;
-        /* padding-right:3px; */
-    }
-
-    .titlebar-buttonbox * {
-        /* border-radius: 5px; */
-        width:35px;
-        height:38px;
-    }
-
-    #main-menubar {
-        -moz-box-flex: 1;
-        background-color: var(--toolbar-bgcolor,--toolbar-non-lwt-bgcolor);
-        background-clip: padding-box;
-        border-right: 30px solid transparent;
-        border-image: linear-gradient(to left, transparent, var(--toolbar-bgcolor,--toolbar-non-lwt-bgcolor) 30px) 20 / 30px;
-    }
-
-    #toolbar-menubar:not([inactive]) {
-        z-index: 2;
-    }
-
-    #toolbar-menubar[inactive] > #menubar-items {
-        opacity: 0;
-        pointer-events: none;
-        margin-left: var(--uc-window-drag-space-width,0px);
-    }
-
-    :root[inFullscreen] #nav-bar {
-        border-right: none !important;
-    }
-}
+}