mirrors/Firefox-UI-Fix
1
Fork 0
mirror of https://github.com/black7375/Firefox-UI-Fix.git synced 2025-12-15 15:20:33 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean: Utils - OS($win) as simple #744

Browse source
This commit is contained in:
alstjr7375 2023-08-12 21:43:15 +09:00
parent bde553a6dc
commit 6ce2494986
5 changed files with 52 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

8
__tests__/native_menu.test.scss
View file

@ -42,7 +42,7 @@
}
@include expect {
@media not (-moz-windows-non-native-menus) {
@#{media} (-moz-os-version: windows-win7), (-moz-platform: windows-win7), (-moz-os-version: windows-win8), (-moz-platform: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
@#{media} (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) {
@include example;
}
}
@ -52,7 +52,7 @@
}
}
@media (-moz-windows-non-native-menus) {
@#{media} (-moz-os-version: windows-win7), (-moz-platform: windows-win7), (-moz-os-version: windows-win8), (-moz-platform: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
@#{media} (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) {
@include example;
}
}
@ -62,12 +62,12 @@
}
}
@media not (-moz-windows-non-native-menus) {
@#{media} (-moz-os-version: windows-win7), (-moz-platform: windows-win7), (-moz-os-version: windows-win8), (-moz-platform: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
@#{media} (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) {
@include example;
}
}
@media (-moz-windows-non-native-menus) {
@#{media} (-moz-os-version: windows-win7), (-moz-platform: windows-win7), (-moz-os-version: windows-win8), (-moz-platform: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
@#{media} (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) {
@include example;
}
}

4
__tests__/os.test.scss
View file

@ -102,7 +102,7 @@
}
}
@include expect {
@media (-moz-os-version: windows-win7), (-moz-platform: windows-win7), (-moz-os-version: windows-win8), (-moz-platform: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) {
@include example;
}
}
@ -135,7 +135,7 @@
}
}
@include expect {
@media (-moz-mac-big-sur-theme: 0), (-moz-gtk-csd-available), (-moz-os-version: windows-win7), (-moz-platform: windows-win7), (-moz-os-version: windows-win8), (-moz-platform: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows), (-moz-mac-big-sur-theme: 0), (-moz-gtk-csd-available) {
@include example;
}
@supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {

96
css/leptonChrome.css generated
View file

@ -238,11 +238,9 @@
/*= Windows - Native Menu ====================================================*/
@media not (-moz-windows-non-native-menus) {
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
.customization-uidensity-menuitem > .menu-iconic-left {
width: unset !important;
}
@ -368,11 +366,9 @@
}
/*= Titlebar Container Size at maximized #384 ================================*/
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
@supports not -moz-bool-pref("userChrome.compatibility.os.windows_maximized") {
:root[tabsintitlebar] #titlebar {
/* -moz-default-appearance: -moz-window-titlebar */
@ -396,11 +392,9 @@
}
/*= Windows - Classic Theme #734 =============================================*/
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
@media (-moz-windows-classic) {
:root[tabsintitlebar][sizemode="normal"]:not(:-moz-lwtheme) #navigator-toolbox {
appearance: auto !important;
@ -2390,11 +2384,9 @@
}
@media not (-moz-windows-non-native-menus) {
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
html#main-window #mainPopupSet menupopup:not(.in-menulist) {
--menu-background-color: Menu !important;
}
@ -2921,11 +2913,9 @@
}
/*- Each OS ----------------------------------------------------------------*/
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
xul|checkbox,
xul|radio {
padding-inline-start: 0 !important;
@ -4093,11 +4083,9 @@
}
}
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
.titlebar-spacer[type="pre-tabs"] {
width: var(--uc-title-post-spacer) !important;
}
@ -4550,11 +4538,9 @@
padding-block: var(--menu-padding) !important;
}
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
#ContentSelectDropdown > menupopup > menucaption,
#ContentSelectDropdown > menupopup > menuitem {
padding-block: 0 !important;
@ -5289,11 +5275,9 @@
@supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@supports -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
:root:is([tabsintitlebar], [sizemode="fullscreen"]) {
--uc-window-drag-space-pre: 0px;
}
@ -5326,11 +5310,9 @@
@supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
@supports not -moz-bool-pref("userChrome.tabbar.as_titlebar") {
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
:root:is([tabsintitlebar], [sizemode="fullscreen"]) {
--uc-window-control-space: 0px;
}
@ -5358,11 +5340,9 @@
@media screen and (min-width: 1100px) {
@supports -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
:root:is([tabsintitlebar], [sizemode="fullscreen"]) {
--uc-window-drag-space-pre: 0px;
}
@ -5395,11 +5375,9 @@
@supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
@supports not -moz-bool-pref("userChrome.tabbar.as_titlebar") {
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
:root:is([tabsintitlebar], [sizemode="fullscreen"]) {
--uc-window-control-space: 0px;
}
@ -5487,11 +5465,9 @@
}
}
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
:root[sizemode="maximized"][tabsintitlebar] {
--uc-titlebar-padding: 8px;
}
@ -5641,11 +5617,9 @@
}
}
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
:root[sizemode="maximized"][tabsintitlebar] {
--uc-titlebar-padding: 8px;
}
@ -5792,11 +5766,9 @@
}
}
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
:root[sizemode="maximized"][tabsintitlebar] {
--uc-titlebar-padding: 8px;
}
@ -5946,11 +5918,9 @@
}
}
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
:root[sizemode="maximized"][tabsintitlebar] {
--uc-titlebar-padding: 8px;
}
@ -6109,11 +6079,9 @@
}
}
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
:root[sizemode="maximized"][tabsintitlebar] {
--uc-titlebar-padding: 8px;
}
@ -6262,11 +6230,9 @@
}
}
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
:root[sizemode="maximized"][tabsintitlebar] {
--uc-titlebar-padding: 8px;
}
@ -6367,11 +6333,9 @@
border-inline-color: transparent;
}
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
@supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
#nav-bar {
border-inline-start-width: var(--uc-window-drag-space-pre);
@ -11685,13 +11649,11 @@
}
}
/* Padding - Non Native */
@media (-moz-gtk-csd-available),
(-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
@media (-moz-os-version: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows),
(-moz-gtk-csd-available) {
@media (-moz-windows-non-native-menus) {
:root {
--context-menu-background-padding: 1em;
@ -11816,11 +11778,9 @@
}
/* Padding - Windows */
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
:root {
--bookmark-menu-icon-text-padding: calc(
var(--context-menu-text-padding) + var(--arrowpanel-menuitem-padding-inline)
@ -11909,11 +11869,9 @@
}
}
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
@media not (-moz-windows-non-native-menus) {
:not(menu, #ContentSelectDropdown, #context-navigation)
> menupopup:not(.in-menulist)
@ -12048,11 +12006,9 @@
}
/* Windows */
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
/* Bookmark Popup - None icon menu */
menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
@ -12330,11 +12286,9 @@
}
/*= Tab Mix Plus =============================================================*/
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
#context_openANewTab.tabmix-newtab-menu-icon .menu-iconic-left {
display: none;
}

16
css/leptonContent.css generated
View file

@ -3211,13 +3211,11 @@
padding-inline-start: var(--context-menu-background-padding) !important;
}
/* Padding - Non Native */
@media (-moz-gtk-csd-available),
(-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
@media (-moz-os-version: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows),
(-moz-gtk-csd-available) {
@media (-moz-windows-non-native-menus) {
:root {
--context-menu-background-padding: 1em;
@ -3267,11 +3265,9 @@
}
/* Padding - Windows */
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
:root {
--bookmark-menu-icon-text-padding: calc(
var(--context-menu-text-padding) + var(--arrowpanel-menuitem-padding-inline)
@ -3360,11 +3356,9 @@
}
}
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
(-moz-platform: windows) {
@media not (-moz-windows-non-native-menus) {
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),

23
src/utils/_os.scss
View file

@ -14,7 +14,7 @@ $win10: "win10";
$bigsur: "bigsur";
//== Privated Variables ========================================================
$_win-template: "-moz-os-version: windows-" "-moz-platform: windows-";
$_win-template: "-moz-os-version: windows" "-moz-platform: windows";
$_win-media: (
#{$win7}: "win7",
#{$win8}: "win8",
@ -25,12 +25,26 @@ $_win-media: (
$result-template: ();
@for $i from 1 through list.length($_win-template) {
$result-value: list.nth($_win-template, $i) + $_win-value;
$result-value: list.nth($_win-template, $i) + "-" + $_win-value;
$result-template: list.append($result-template, $result-value);
}
$_win-media: map.set($_win-media, $_win-key, $result-template);
}
@function _win-only-result() {
$result-template: ();
@each $_win-value in map.values($_win-media) {
$result-template: list.append($result-template, list.nth($_win-value, 1));
}
@return list.append($result-template, list.nth($_win-template, 2))
}
$_win-media: map.merge(
$_win-media,
(#{$win}: _win-only-result())
);
$_others-media: (
#{$linux}: "-moz-gtk-csd-available",
#{$bigsur}: "-moz-mac-big-sur-theme: 0",
@ -41,11 +55,6 @@ $_os-media: map.merge(
//== Mixin =====================================================================
@mixin OS($osNames...) {
@if list.index($osNames, $win) {
$osNames: list-utils.remove($osNames, $win);
$osNames: list.join($osNames, map.keys($_win-media));
}
$osMedias: ();
@each $osName in $osNames {
$osMedia: map.get($_os-media, $osName);