From 7694e39448863458d95818732fe73832efe44cd0 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 12 Aug 2022 09:05:32 +0900 Subject: [PATCH] Clean: Theme, Icons - Folder structure --- css/leptonChrome.css | 21 +++-- src/contents/_activity_stream.scss | 2 +- src/contents/_context_menu.scss | 2 +- src/icons/_index.scss | 33 ++++++++ .../_activity_stream.scss} | 0 .../_bookmark_menu.scss} | 0 .../{_layout_menu.scss => layout/_menu.scss} | 2 +- .../_menu_common.scss} | 0 .../_menu_contents.scss} | 2 +- .../_panel.scss} | 0 src/leptonChrome.scss | 77 ++----------------- src/theme/_index.scss | 35 +++++++++ 12 files changed, 87 insertions(+), 87 deletions(-) create mode 100644 src/icons/_index.scss rename src/icons/{_layout_activity_stream.scss => layout/_activity_stream.scss} (100%) rename src/icons/{_layout_bookmark_menu.scss => layout/_bookmark_menu.scss} (100%) rename src/icons/{_layout_menu.scss => layout/_menu.scss} (98%) rename src/icons/{_layout_menu_common.scss => layout/_menu_common.scss} (100%) rename src/icons/{_layout_menu_contents.scss => layout/_menu_contents.scss} (98%) rename src/icons/{_layout_panel.scss => layout/_panel.scss} (100%) create mode 100644 src/theme/_index.scss diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 526e257..8a90fec 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -355,7 +355,8 @@ box-shadow: none !important; } } -/** System Default Theme ******************************************************/ +/** Theme *********************************************************************/ +/*= System Default Theme =====================================================*/ @supports -moz-bool-pref("userChrome.theme.system_default") { /*= Common - URL Bar focus color =============================================*/ @media (-moz-windows-accent-color-in-titlebar), (-moz-gtk-csd-available) { @@ -1044,12 +1045,7 @@ } } } -/** Fully Theme Mode **********************************************************/ -/* Default Themes - https://github.com/mozilla/gecko-dev/blob/master/toolkit/mozapps/extensions/default-theme/manifest.json - https://github.com/mozilla/gecko-dev/blob/master/browser/themes/addons/light/manifest.json - https://github.com/mozilla/gecko-dev/blob/master/browser/themes/addons/dark/manifest.json - */ +/*= Fully Theme Mode =========================================================*/ @supports -moz-bool-pref("userChrome.theme.proton_color") { /*= Default Colors - Hard Coded ==============================================*/ /* Based on chrome://global/skin/in-content/common.css */ @@ -1491,7 +1487,7 @@ /* Original: hsla(0,0%,80%,.5), match arrowpanel-dimmed-further */ } } -/* Fully Dark Mode ************************************************************/ +/*= Fully Dark Mode ==========================================================*/ @supports -moz-bool-pref("userChrome.theme.fully_dark") { /*= Remove White Flash =======================================================*/ #tabbrowser-tabbox, @@ -1571,7 +1567,7 @@ } } } -/* Proton Theme Mode **********************************************************/ +/*= Proton Theme Mode ========================================================*/ @supports -moz-bool-pref("userChrome.theme.proton_chrome") { /*= Proton Commons ===========================================================*/ @-moz-document url("chrome://global/content/commonDialog.xhtml"), @@ -2771,7 +2767,7 @@ } } } -/* Monospace ******************************************************************/ +/*= Monospace ================================================================*/ @supports -moz-bool-pref("userChrome.theme.monospace") { * { font-family: -moz-fixed; @@ -7424,6 +7420,7 @@ } } } +/** Icons *********************************************************************/ /** Library - Icons Replace ***************************************************/ @supports -moz-bool-pref("userChrome.icon.library") { /*= Standard Folder - More Visible ===========================================*/ @@ -9921,7 +9918,7 @@ } } } -/*= Waterfox =================================================================*/ +/** Waterfox ******************************************************************/ @supports -moz-bool-pref("userChrome.icon.panel") { #appMenu-restart-button { list-style-image: url("../icons/refresh-cw.svg") !important; @@ -9960,7 +9957,7 @@ background-color: var(--button-active-bgcolor); } } -/*= Tor Browser ==============================================================*/ +/** Tor Browser ***************************************************************/ @supports -moz-bool-pref("userChrome.icon.panel") { #appMenuNewIdentity { list-style-image: url("chrome://browser/skin/new_identity.svg"); diff --git a/src/contents/_activity_stream.scss b/src/contents/_activity_stream.scss index 324e4ac..acc839e 100644 --- a/src/contents/_activity_stream.scss +++ b/src/contents/_activity_stream.scss @@ -29,7 +29,7 @@ /** Activity Stream - Menu Icons ********************************************/ @include Option("userChrome.icon.context_menu") { - @import "../icons/layout_activity_stream"; + @import "../icons/layout/activity_stream"; @import "../icons/activity_stream"; } diff --git a/src/contents/_context_menu.scss b/src/contents/_context_menu.scss index 63b5e16..89f92ea 100644 --- a/src/contents/_context_menu.scss +++ b/src/contents/_context_menu.scss @@ -1,6 +1,6 @@ @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads") { - @import "../icons/layout_menu_contents"; + @import "../icons/layout/menu_contents"; /*= Context Menu ===========================================================*/ @include Option("userChrome.icon.context_menu") { diff --git a/src/icons/_index.scss b/src/icons/_index.scss new file mode 100644 index 0000000..90c2e29 --- /dev/null +++ b/src/icons/_index.scss @@ -0,0 +1,33 @@ +/** Library - Icons Replace ***************************************************/ +@include Option("userChrome.icon.library") { + @import "../library/chrome"; +} + +/** Panel - Icons *************************************************************/ +@include Option("userChrome.icon.panel") { + @import "layout/panel"; + @import "panel"; +} + +/** Menu - Icons Layout *******************************************************/ +@include Option("userChrome.icon.menu") { + @import "layout/menu"; + @import "layout/bookmark_menu"; + + @include Option("userChrome.icon.context_menu") { + @import "context_menu"; + } + @include Option("userChrome.icon.global_menubar") { + @import "global_menubar"; + } + @include Option("userChrome.icon.global_menu") { + @import "global_menu"; + } +} + +/** Libray Menu ***************************************************************/ +@include Option("userChrome.icon.library") { + @include Option("userChrome.icon.menu") { + @import "library"; + } +} diff --git a/src/icons/_layout_activity_stream.scss b/src/icons/layout/_activity_stream.scss similarity index 100% rename from src/icons/_layout_activity_stream.scss rename to src/icons/layout/_activity_stream.scss diff --git a/src/icons/_layout_bookmark_menu.scss b/src/icons/layout/_bookmark_menu.scss similarity index 100% rename from src/icons/_layout_bookmark_menu.scss rename to src/icons/layout/_bookmark_menu.scss diff --git a/src/icons/_layout_menu.scss b/src/icons/layout/_menu.scss similarity index 98% rename from src/icons/_layout_menu.scss rename to src/icons/layout/_menu.scss index 7493b61..93aac39 100644 --- a/src/icons/_layout_menu.scss +++ b/src/icons/layout/_menu.scss @@ -1,4 +1,4 @@ -@import "./layout_menu_common"; +@import "./menu_common"; //-- Mixin --------------------------------------------------------------------- // Components diff --git a/src/icons/_layout_menu_common.scss b/src/icons/layout/_menu_common.scss similarity index 100% rename from src/icons/_layout_menu_common.scss rename to src/icons/layout/_menu_common.scss diff --git a/src/icons/_layout_menu_contents.scss b/src/icons/layout/_menu_contents.scss similarity index 98% rename from src/icons/_layout_menu_contents.scss rename to src/icons/layout/_menu_contents.scss index 4c383a0..e10008d 100644 --- a/src/icons/_layout_menu_contents.scss +++ b/src/icons/layout/_menu_contents.scss @@ -1,4 +1,4 @@ -@import "../icons/layout_menu_common"; +@import "./menu_common"; //-- Mixin --------------------------------------------------------------------- $_placesPopupSet: "menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)"; diff --git a/src/icons/_layout_panel.scss b/src/icons/layout/_panel.scss similarity index 100% rename from src/icons/_layout_panel.scss rename to src/icons/layout/_panel.scss diff --git a/src/leptonChrome.scss b/src/leptonChrome.scss index 8b2e681..762566e 100644 --- a/src/leptonChrome.scss +++ b/src/leptonChrome.scss @@ -19,42 +19,8 @@ /** Compatibility Fixes *******************************************************/ @import "compatibility/index"; -/** System Default Theme ******************************************************/ -@include Option("userChrome.theme.system_default") { - @import "theme/system_default_theme"; -} - -/** Fully Theme Mode **********************************************************/ -/* Default Themes - https://github.com/mozilla/gecko-dev/blob/master/toolkit/mozapps/extensions/default-theme/manifest.json - https://github.com/mozilla/gecko-dev/blob/master/browser/themes/addons/light/manifest.json - https://github.com/mozilla/gecko-dev/blob/master/browser/themes/addons/dark/manifest.json - */ - -@include Option("userChrome.theme.proton_color") { - @import "theme/proton_color"; - @include Option("userChrome.theme.proton_color.dark_blue_accent") { - @import "theme/dark_blue_accent"; - } -} -@include Option("userChrome.theme.fully_color") { - @import "theme/fully_color"; -} - -/* Fully Dark Mode ************************************************************/ -@include Option("userChrome.theme.fully_dark") { - @import "theme/fully_dark"; -} - -/* Proton Theme Mode **********************************************************/ -@include Option("userChrome.theme.proton_chrome") { - @import "theme/proton_chrome"; -} - -/* Monospace ******************************************************************/ -@include Option("userChrome.theme.monospace") { - @import "theme/monospace"; -} +/** Theme *********************************************************************/ +@import "theme/index"; /** Decoration ****************************************************************/ @import "decoration/index"; @@ -92,45 +58,14 @@ /** Hidden ********************************************************************/ @import "hidden/index"; -/** Library - Icons Replace ***************************************************/ -@include Option("userChrome.icon.library") { - @import "library/chrome"; -} +/** Icons *********************************************************************/ +@import "icons/index"; -/** Panel - Icons *************************************************************/ -@include Option("userChrome.icon.panel") { - @import "icons/layout_panel"; - @import "icons/panel"; -} - -/** Menu - Icons Layout *******************************************************/ -@include Option("userChrome.icon.menu") { - @import "icons/layout_menu"; - @import "icons/layout_bookmark_menu"; - - @include Option("userChrome.icon.context_menu") { - @import "icons/context_menu"; - } - @include Option("userChrome.icon.global_menubar") { - @import "icons/global_menubar"; - } - @include Option("userChrome.icon.global_menu") { - @import "icons/global_menu"; - } -} - -/** Libray Menu ***************************************************************/ -@include Option("userChrome.icon.library") { - @include Option("userChrome.icon.menu") { - @import "icons/library"; - } -} - -/*= Waterfox =================================================================*/ +/** Waterfox ******************************************************************/ @import "icons/waterfox"; @include Option("userChrome.theme.fully_color") { @import "theme/waterfox"; } -/*= Tor Browser ==============================================================*/ +/** Tor Browser ***************************************************************/ @import "icons/tor_browser"; diff --git a/src/theme/_index.scss b/src/theme/_index.scss new file mode 100644 index 0000000..36f344e --- /dev/null +++ b/src/theme/_index.scss @@ -0,0 +1,35 @@ +/*= System Default Theme =====================================================*/ +@include Option("userChrome.theme.system_default") { + @import "system_default_theme"; +} + +/*= Fully Theme Mode =========================================================*/ +// Default Themes +// https://github.com/mozilla/gecko-dev/blob/master/toolkit/mozapps/extensions/default-theme/manifest.json +// https://github.com/mozilla/gecko-dev/blob/master/browser/themes/addons/light/manifest.json +// https://github.com/mozilla/gecko-dev/blob/master/browser/themes/addons/dark/manifest.json + +@include Option("userChrome.theme.proton_color") { + @import "proton_color"; + @include Option("userChrome.theme.proton_color.dark_blue_accent") { + @import "dark_blue_accent"; + } +} +@include Option("userChrome.theme.fully_color") { + @import "fully_color"; +} + +/*= Fully Dark Mode ==========================================================*/ +@include Option("userChrome.theme.fully_dark") { + @import "fully_dark"; +} + +/*= Proton Theme Mode ========================================================*/ +@include Option("userChrome.theme.proton_chrome") { + @import "proton_chrome"; +} + +/*= Monospace ================================================================*/ +@include Option("userChrome.theme.monospace") { + @import "monospace"; +}