From 8ce8304d771b84a93030eac139c40408bb1109cf Mon Sep 17 00:00:00 2001 From: 2641a40fd44383320adde4b027a1d0b03bd550 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com> Date: Mon, 6 Feb 2023 12:39:52 +0500 Subject: [PATCH] Fix: Rounding - Context menu and library on Windows 10 --- css/leptonChrome.css | 48 ++++++++++++++++++++++++--------- css/leptonContent.css | 53 +++++++++++++++++++++++++++---------- src/contents/_rounding.scss | 4 +-- src/leptonContent.scss | 5 ++++ src/library/_proton.scss | 30 ++++++++++++--------- src/rounding/_index.scss | 1 + src/rounding/_library.scss | 17 ++++++++++++ src/rounding/_square.scss | 2 +- 8 files changed, 118 insertions(+), 42 deletions(-) create mode 100644 src/rounding/_library.scss diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 8259817..37371c5 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -2443,10 +2443,11 @@ #placesToolbar > toolbarbutton { appearance: none !important; padding: 5px !important; + border-radius: 4px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_button") { + @supports -moz-bool-pref("userChrome.rounding.square_button") { #placesToolbar > toolbarbutton { - border-radius: 4px !important; + border-radius: 0 !important; } } #placesToolbar > toolbarbutton[disabled] { @@ -2473,11 +2474,12 @@ color: var(--organizer-color) !important; padding-block: 5px !important; padding-inline-start: 5px !important; + border-radius: 4px !important; margin-inline-end: 2px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_button") { + @supports -moz-bool-pref("userChrome.rounding.square_button") { #placesMenu > menu { - border-radius: 4px !important; + border-radius: 0 !important; } } #placesMenu > menu[_moz-menuactive="true"], @@ -2501,14 +2503,15 @@ background-color: var(--organizer-toolbar-field-background) !important; color: var(--organizer-color) !important; border: 1px solid var(--organizer-toolbar-field-border-color) !important; + border-radius: 4px !important; margin: 0 !important; padding-block: 2px !important; min-height: 24px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_field") { + @supports -moz-bool-pref("userChrome.rounding.square_field") { #searchFilter, #detailsPane html|input { - border-radius: 4px !important; + border-radius: 0 !important; } } #searchFilter[focused] { @@ -2646,15 +2649,16 @@ margin: 0 !important; margin-inline-end: 4px !important; border: 1px solid var(--organizer-pane-field-border-color) !important; + border-radius: 4px !important; color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; -moz-context-properties: fill !important; fill: currentColor !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_button") { + @supports -moz-bool-pref("userChrome.rounding.square_button") { #editBookmarkPanelRows .expander-up, #editBookmarkPanelRows .expander-down { - border-radius: 4px !important; + border-radius: 0 !important; } } #editBookmarkPanelRows .expander-up:hover, @@ -2684,14 +2688,15 @@ } #places input { border: 1px solid var(--organizer-pane-field-border-color) !important; + border-radius: 4px !important; background-color: var(--organizer-content-background) !important; color: var(--organizer-color) !important; min-height: 20px !important; padding-inline: 4px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_field") { + @supports -moz-bool-pref("userChrome.rounding.square_field") { #places input { - border-radius: 4px !important; + border-radius: 0 !important; } } #places input:focus { @@ -2710,10 +2715,11 @@ color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; border: 1px solid var(--organizer-border-color) !important; + border-radius: 4px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_field") { + @supports -moz-bool-pref("userChrome.rounding.square_field") { #editBMPanel_tagsSelectorRow > richlistbox { - border-radius: 4px !important; + border-radius: 0 !important; } } #editBMPanel_tagsSelectorRow > richlistbox > richlistitem { @@ -3130,7 +3136,7 @@ } } @supports -moz-bool-pref("userChrome.rounding.square_menupopup") { - xul|menulist > xul|menupopup { + menupopup { --panel-border-radius: 0px !important; border-radius: 0 !important; } @@ -3166,6 +3172,22 @@ border-radius: 0 !important; } } +/*= Library ==============================================================*/ +@supports -moz-bool-pref("userChrome.rounding.square_button") { + #placesToolbar > toolbarbutton, + #placesMenu > menu, + #editBookmarkPanelRows .expander-up, + #editBookmarkPanelRows .expander-down { + border-radius: 0 !important; + } +} +@supports -moz-bool-pref("userChrome.rounding.square_field") { + #searchFilter, + #detailsPane html|input, + #places input #editBMPanel_tagsSelectorRow > richlistbox { + border-radius: 0 !important; + } +} /* --toolbarbutton-border-radius: 4px; */ diff --git a/css/leptonContent.css b/css/leptonContent.css index 6e72a4f..7b71dc6 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2244,10 +2244,11 @@ #placesToolbar > toolbarbutton { appearance: none !important; padding: 5px !important; + border-radius: 4px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_button") { + @supports -moz-bool-pref("userChrome.rounding.square_button") { #placesToolbar > toolbarbutton { - border-radius: 4px !important; + border-radius: 0 !important; } } #placesToolbar > toolbarbutton[disabled] { @@ -2274,11 +2275,12 @@ color: var(--organizer-color) !important; padding-block: 5px !important; padding-inline-start: 5px !important; + border-radius: 4px !important; margin-inline-end: 2px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_button") { + @supports -moz-bool-pref("userChrome.rounding.square_button") { #placesMenu > menu { - border-radius: 4px !important; + border-radius: 0 !important; } } #placesMenu > menu[_moz-menuactive="true"], @@ -2302,14 +2304,15 @@ background-color: var(--organizer-toolbar-field-background) !important; color: var(--organizer-color) !important; border: 1px solid var(--organizer-toolbar-field-border-color) !important; + border-radius: 4px !important; margin: 0 !important; padding-block: 2px !important; min-height: 24px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_field") { + @supports -moz-bool-pref("userChrome.rounding.square_field") { #searchFilter, #detailsPane html|input { - border-radius: 4px !important; + border-radius: 0 !important; } } #searchFilter[focused] { @@ -2447,15 +2450,16 @@ margin: 0 !important; margin-inline-end: 4px !important; border: 1px solid var(--organizer-pane-field-border-color) !important; + border-radius: 4px !important; color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; -moz-context-properties: fill !important; fill: currentColor !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_button") { + @supports -moz-bool-pref("userChrome.rounding.square_button") { #editBookmarkPanelRows .expander-up, #editBookmarkPanelRows .expander-down { - border-radius: 4px !important; + border-radius: 0 !important; } } #editBookmarkPanelRows .expander-up:hover, @@ -2485,14 +2489,15 @@ } #places input { border: 1px solid var(--organizer-pane-field-border-color) !important; + border-radius: 4px !important; background-color: var(--organizer-content-background) !important; color: var(--organizer-color) !important; min-height: 20px !important; padding-inline: 4px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_field") { + @supports -moz-bool-pref("userChrome.rounding.square_field") { #places input { - border-radius: 4px !important; + border-radius: 0 !important; } } #places input:focus { @@ -2511,10 +2516,11 @@ color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; border: 1px solid var(--organizer-border-color) !important; + border-radius: 4px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_field") { + @supports -moz-bool-pref("userChrome.rounding.square_field") { #editBMPanel_tagsSelectorRow > richlistbox { - border-radius: 4px !important; + border-radius: 0 !important; } } #editBMPanel_tagsSelectorRow > richlistbox > richlistitem { @@ -2830,9 +2836,9 @@ } } @supports -moz-bool-pref("userChrome.rounding.square_menupopup") { - @-moz-document url-prefix("about:preferences"), url-prefix("chrome://browser/content/preferences/dialogs") + @-moz-document url-prefix("about:"), url-prefix("chrome://") { - xul|menulist > xul|menupopup { + menupopup { --panel-border-radius: 0 !important; } } @@ -2842,6 +2848,25 @@ } } } +@-moz-document url("chrome://browser/content/places/places.xhtml") +{ + /*= Library ==============================================================*/ + @supports -moz-bool-pref("userChrome.rounding.square_button") { + #placesToolbar > toolbarbutton, + #placesMenu > menu, + #editBookmarkPanelRows .expander-up, + #editBookmarkPanelRows .expander-down { + border-radius: 0 !important; + } + } + @supports -moz-bool-pref("userChrome.rounding.square_field") { + #searchFilter, + #detailsPane html|input, + #places input #editBMPanel_tagsSelectorRow > richlistbox { + border-radius: 0 !important; + } + } +} /** Monospace *****************************************************************/ @supports -moz-bool-pref("userContent.page.monospace") { @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/places/places.xhtml"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss index e00624b..e7bdde3 100644 --- a/src/contents/_rounding.scss +++ b/src/contents/_rounding.scss @@ -85,8 +85,8 @@ } @include Option("userChrome.rounding.square_menupopup") { - @include moz-document(url-prefix "about:preferences", url-prefix "chrome://browser/content/preferences/dialogs") { - xul|menulist > xul|menupopup { + @include moz-document(url-prefix "about:", url-prefix "chrome://") { + menupopup { --panel-border-radius: 0 !important; } } diff --git a/src/leptonContent.scss b/src/leptonContent.scss index 70259b8..abe1704 100644 --- a/src/leptonContent.scss +++ b/src/leptonContent.scss @@ -38,6 +38,11 @@ /** Rounding ******************************************************************/ @import "contents/rounding"; +// Put here to include library as a tab +@include moz-document(url "chrome://browser/content/places/places.xhtml") { + @import "rounding/library"; +} + /** Monospace *****************************************************************/ @include Option("userContent.page.monospace") { @import "contents/monospace"; diff --git a/src/library/_proton.scss b/src/library/_proton.scss index 68d9cdf..f48a152 100644 --- a/src/library/_proton.scss +++ b/src/library/_proton.scss @@ -80,9 +80,10 @@ > toolbarbutton { appearance: none !important; padding: 5px !important; + border-radius: 4px !important; - @include NotOption("userChrome.rounding.square_button") { - border-radius: 4px !important; + @include Option("userChrome.rounding.square_button") { + border-radius: 0 !important; } &[disabled] { @@ -113,10 +114,11 @@ color: var(--organizer-color) !important; padding-block: 5px !important; padding-inline-start: 5px !important; + border-radius: 4px !important; margin-inline-end: 2px !important; - @include NotOption("userChrome.rounding.square_button") { - border-radius: 4px !important; + @include Option("userChrome.rounding.square_button") { + border-radius: 0 !important; } &[_moz-menuactive="true"], @@ -143,12 +145,13 @@ background-color: var(--organizer-toolbar-field-background) !important; color: var(--organizer-color) !important; border: 1px solid var(--organizer-toolbar-field-border-color) !important; + border-radius: 4px !important; margin: 0 !important; padding-block: 2px !important; min-height: 24px !important; - @include NotOption("userChrome.rounding.square_field") { - border-radius: 4px !important; + @include Option("userChrome.rounding.square_field") { + border-radius: 0 !important; } } @@ -307,13 +310,14 @@ treechildren { margin: 0 !important; margin-inline-end: 4px !important; border: 1px solid var(--organizer-pane-field-border-color) !important; + border-radius: 4px !important; color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; -moz-context-properties: fill !important; fill: currentColor !important; - @include NotOption("userChrome.rounding.square_button") { - border-radius: 4px !important; + @include Option("userChrome.rounding.square_button") { + border-radius: 0 !important; } &:hover { @@ -346,13 +350,14 @@ treechildren { #places input { border: 1px solid var(--organizer-pane-field-border-color) !important; + border-radius: 4px !important; background-color: var(--organizer-content-background) !important; color: var(--organizer-color) !important; min-height: 20px !important; padding-inline: 4px !important; - @include NotOption("userChrome.rounding.square_field") { - border-radius: 4px !important; + @include Option("userChrome.rounding.square_field") { + border-radius: 0 !important; } &:focus { @@ -374,9 +379,10 @@ treechildren { color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; border: 1px solid var(--organizer-border-color) !important; + border-radius: 4px !important; - @include NotOption("userChrome.rounding.square_field") { - border-radius: 4px !important; + @include Option("userChrome.rounding.square_field") { + border-radius: 0 !important; } > richlistitem { diff --git a/src/rounding/_index.scss b/src/rounding/_index.scss index a46fa88..577efc6 100644 --- a/src/rounding/_index.scss +++ b/src/rounding/_index.scss @@ -1,5 +1,6 @@ /** Rounding ******************************************************************/ @import "square"; +@import "library"; /* --toolbarbutton-border-radius: 4px; diff --git a/src/rounding/_library.scss b/src/rounding/_library.scss new file mode 100644 index 0000000..a31bc2e --- /dev/null +++ b/src/rounding/_library.scss @@ -0,0 +1,17 @@ +/*= Library ==============================================================*/ +@include Option("userChrome.rounding.square_button") { + #placesToolbar > toolbarbutton, + #placesMenu > menu, + #editBookmarkPanelRows .expander-up, + #editBookmarkPanelRows .expander-down { + border-radius: 0 !important; + } +} +@include Option("userChrome.rounding.square_field") { + #searchFilter, + #detailsPane html|input, + #places input + #editBMPanel_tagsSelectorRow > richlistbox { + border-radius: 0 !important; + } +} diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index a1567fa..d2dd19e 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -55,7 +55,7 @@ } @include Option("userChrome.rounding.square_menupopup") { - xul|menulist > xul|menupopup { + menupopup { --panel-border-radius: 0px !important; border-radius: 0 !important; }