From 000b76e1ecd832ca8b3af2b2e04619aa6a34425d Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Tue, 28 Jun 2022 05:16:43 +0900
Subject: [PATCH] Clean: Icons - Layout variables

---
 src/icons/_layout_menu.scss        | 24 +-----------------------
 src/icons/_layout_menu_common.scss | 24 ++++++++++++++++++++++++
 src/library/_contents_menu.scss    | 16 +++-------------
 3 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/icons/_layout_menu.scss b/src/icons/_layout_menu.scss
index 57e8922..fb0be85 100644
--- a/src/icons/_layout_menu.scss
+++ b/src/icons/_layout_menu.scss
@@ -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;
diff --git a/src/icons/_layout_menu_common.scss b/src/icons/_layout_menu_common.scss
index 30e557e..737b5e7 100644
--- a/src/icons/_layout_menu_common.scss
+++ b/src/icons/_layout_menu_common.scss
@@ -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(
diff --git a/src/library/_contents_menu.scss b/src/library/_contents_menu.scss
index f45e968..659104c 100644
--- a/src/library/_contents_menu.scss
+++ b/src/library/_contents_menu.scss
@@ -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;
 }