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

Clean: Icons - Layout variables

Browse source
This commit is contained in:
alstjr7375 2022-06-28 05:16:43 +09:00
parent f866a91109
commit 000b76e1ec
3 changed files with 28 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/icons/_layout_menu.scss
View file

@ -2,29 +2,6 @@
//-- Mixin ---------------------------------------------------------------------
// Components
$_nestedPopupIcon: ":not(menu, #ContentSelectDropdown) > menupopup >";
$_nestedPopupPadding: ":not(menu, #ContentSelectDropdown, #context-navigation) > menupopup >";
$_iconMenuPopup: "menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)";
$_nestedPopupIconMenus: selector.nest(
$_nestedPopupIcon,
"#{$_iconMenuitem}, #{$_iconMenu}"
);
$_nestedPopupPaddingMenus: selector.nest(
$_nestedPopupPadding,
"#{$_iconMenuitem}, #{$_iconMenu}"
);
$_iconMenuPopupMenus: selector.nest(
$_iconMenuPopup,
"#{$_iconMenuitem}, #{$_iconMenu}"
);
$_globalMenus: "#main-menubar > menu";
$_libraryMenuitem: "menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem";
$_libraryMenu: "menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu";
$_sendTabMenuitem: "menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) > menuitem";
$_otherIconMenu: ".openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar";
$_layoutCommonMenus: (
$_iconMenuPopupMenus,
$_libraryMenuitem,
@ -54,6 +31,7 @@ $_layoutCommonMenus: (
}
//------------------------------------------------------------------------------
#{$_initialMenus},
#{$_globalMenus} {
@include _initial_menus;

24
src/icons/_layout_menu_common.scss
View file

@ -7,6 +7,30 @@ $_iconNoneCommon: ".in-menulist, [checked=\"true\"]";
$_iconMenuitem: "menuitem:not(.menuitem-iconic, .bookmark-item, #{$_iconNoneCommon})";
$_iconMenu: "menu:not(.menu-iconic, #{$_iconNoneCommon})";
// Components
$_nestedPopupIcon: ":not(menu, #ContentSelectDropdown) > menupopup >";
$_nestedPopupPadding: ":not(menu, #ContentSelectDropdown, #context-navigation) > menupopup >";
$_iconMenuPopup: "menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)";
$_nestedPopupIconMenus: selector.nest(
$_nestedPopupIcon,
"#{$_iconMenuitem}, #{$_iconMenu}"
);
$_nestedPopupPaddingMenus: selector.nest(
$_nestedPopupPadding,
"#{$_iconMenuitem}, #{$_iconMenu}"
);
$_iconMenuPopupMenus: selector.nest(
$_iconMenuPopup,
"#{$_iconMenuitem}, #{$_iconMenu}"
);
$_globalMenus: "#main-menubar > menu";
$_libraryMenuitem: "menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem";
$_libraryMenu: "menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu";
$_sendTabMenuitem: "menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) > menuitem";
$_otherIconMenu: ".openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar";
//-- Mixin ---------------------------------------------------------------------
// Init Menu
$_initialMenus: selector.append(

16
src/library/_contents_menu.scss
View file

@ -4,18 +4,8 @@
@mixin _library_contextMenu {
#placesContext #{$_iconMenuitem},
#placesContext #{$_iconMenu},
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu {
@content;
}
}
@mixin _library_nativeContextMenu {
:not(menu, #ContentSelectDropdown)
> menupopup
> #{$_iconMenuitem},
:not(menu, #ContentSelectDropdown)
> menupopup
> #{$_iconMenu} {
#{$_libraryMenuitem},
#{$_libraryMenu} {
@content;
}
}
@ -31,7 +21,7 @@
}
/* For native context menus */
@include _library_nativeContextMenu {
#{$_nestedPopupIconMenus} {
@include _layout_icon_native_menus;
}