Fix: Rounding - Context menu and library on Windows 10

This commit is contained in:
2641a40fd44383320adde4b027a1d0b03bd550 2023-02-06 12:39:52 +05:00
parent 24948d4407
commit 8ce8304d77
8 changed files with 118 additions and 42 deletions

View file

@ -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;
*/

View file

@ -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://)).*/$")

View file

@ -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;
}
}

View file

@ -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";

View file

@ -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 {

View file

@ -1,5 +1,6 @@
/** Rounding ******************************************************************/
@import "square";
@import "library";
/*
--toolbarbutton-border-radius: 4px;

View file

@ -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;
}
}

View file

@ -55,7 +55,7 @@
}
@include Option("userChrome.rounding.square_menupopup") {
xul|menulist > xul|menupopup {
menupopup {
--panel-border-radius: 0px !important;
border-radius: 0 !important;
}