From 3c16f0e6daf6d24355f6822f035cc7860ac6755b Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sun, 26 Feb 2023 14:51:13 +0800 Subject: [PATCH 01/10] Fixed Budgie desktop issues --- src/sass/_variables.scss | 2 +- src/sass/gtk/_common-3.0.scss | 6 +- src/sass/gtk/apps/_budgie.scss | 300 ++++++++++++++++++++++----------- src/sass/gtk/apps/_misc.scss | 23 +-- 4 files changed, 209 insertions(+), 122 deletions(-) diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss index d87455b..a791e65 100644 --- a/src/sass/_variables.scss +++ b/src/sass/_variables.scss @@ -43,7 +43,7 @@ $circular_radius: 9999px; $bt_radius: if($laptop == 'false', 6px, 6px); $bd_radius: if($laptop == 'false', 8px, 8px); $wm_radius: if($laptop == 'false', 12px, 12px); -$mn_radius: if($laptop == 'false', 10px, 10px); +$mn_radius: if($laptop == 'false', 14px, 12px); $dash_radius: if($laptop == 'false', 24px, 18px); $base_border_radius: if($laptop == 'false', 8px, 8px); $modal_radius: $base_border_radius * 2; diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index 33c3a22..deb2201 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -2194,10 +2194,10 @@ menu { border: none; color: $fg_color; + @if $variant == 'dark' { box-shadow: inset 0 0 0 1px $highlight_color; } + .csd & { background-color: $menu_bg; - @if $variant == 'light' { border: none; } - @if $variant == 'dark' { border: 1px solid lighten($menu_bg, 6%); } } separator { @@ -2212,7 +2212,7 @@ menu { min-height: 12px; min-width: 40px; padding: $container_padding / 2 $container_padding; - border-radius: $mn_radius - 3px; + border-radius: $bt_radius; text-shadow: none; color: $fg_color; // -gtk-icon-style: symbolic; diff --git a/src/sass/gtk/apps/_budgie.scss b/src/sass/gtk/apps/_budgie.scss index 1c2a457..0e8c0c9 100644 --- a/src/sass/gtk/apps/_budgie.scss +++ b/src/sass/gtk/apps/_budgie.scss @@ -203,14 +203,16 @@ $raven_padding: 8px; font-size: 110%; } - .categories { - &:dir(ltr) { border-bottom-left-radius: $bt_radius; } - &:dir(rtl) { border-bottom-right-radius: $bt_radius; } - } - scrolledwindow.sidebar.categories { //AppMenu (budgie) - border-bottom-left-radius: $wm_radius; - margin: 0 0 1px 1px; + &:dir(ltr) { + margin: 0 0 1px 1px; + border-bottom-left-radius: $bt_radius; + } + + &:dir(rtl) { + margin: 0 1px 1px 0; + border-bottom-right-radius: $bt_radius; + } button.flat.category-button { min-height: 28px; @@ -228,6 +230,18 @@ $raven_padding: 8px; } } + > frame > box > overlay > box > box > scrolledwindow.sidebar.categories { + &:dir(ltr) { + margin: 0 0 0 1px; + border-bottom-left-radius: 0; + } + + &:dir(rtl) { + margin: 0 1px 0 0; + border-bottom-right-radius: 0; + } + } + row { padding: 0; @@ -238,6 +252,57 @@ $raven_padding: 8px; border-radius: 0; } } + + list.left-overlay-menu { + box-shadow: 0 5px 8px rgba(black, 0.15), 0 8px 15px rgba(black, 0.08), $wm_outline, inset 0 0 0 1px $highlight_color; + background-color: $base_color; + padding: $container_padding; + margin: $container_padding; + border-radius: $mn_radius; + + > row.activatable { + border-radius: $bt_radius; + + &, &:hover, &:selected, &:active, &:active:hover { + background-color: transparent; + } + + &:not(:last-child) { + margin-bottom: $container_padding / 2; + } + + &:active { + background-color: $selected_bg_color; + + label, button { color: $selected_fg_color; } + } + + button.menuitem { + border-radius: $bt_radius; + + @extend %flat_button; + } + } + } + + .budgie-menu-footer { + border-top: 1px solid $borders_color; + padding: $container_padding; + + button { + min-height: 16px; + min-width: 16px; + padding: $container_padding; + + &.image-button { + border-radius: $circular_radius; + + &:not(.last-child) { + margin-right: $container_padding; + } + } + } + } } // Clipboard popover @@ -783,22 +848,17 @@ $raven_shadow: 0 0 3px 0 rgba(black, 0.2), 0 0 8px 0 rgba(black, 0.15), 0 0 16px stackswitcher.linked > button { @extend %raven_button; } .raven-header { - min-height: 36px; + min-height: $medium_size; padding: 2px; &:not(.top) { - margin-top: -6px; // remove extra spaces, but not perfect :( - - button { + button.image-button { @extend %flat_button; min-height: 32px; min-width: 32px; margin: 0; padding: 0; - - &.image-button { - border-radius: $circular_radius; - } + border-radius: $circular_radius; } } @@ -847,95 +907,152 @@ $raven_shadow: 0 0 3px 0 rgba(black, 0.2), 0 0 8px 0 rgba(black, 0.15), 0 0 16px margin: $raven_padding 0; // do not set L/R margins border-radius: $raven_radius; background-color: $raven_header_bg_color; - // draw side edges via opaque box-shadows transition-duration: 0s; border: 1px solid $raven_border_color; - } - .raven-header { - margin-top: -$raven_padding * 2; // unset parent margin - border-radius: $raven_radius $raven_radius 0 0; - } - - .raven-background { - margin-bottom: -$raven_padding * 2; // unset parent margin - border-radius: 0 0 $raven_radius $raven_radius; - background-color: $raven_base_color; - } - - > box.vertical > box.vertical:last-child { - border-radius: $raven_radius; - border: none; - background-color: if($variant =='light', rgba(black, 0.65), rgba(black, 0.35)); - color: rgba(white, 0.65); + .raven-header { + margin-top: -$raven_padding * 2; // unset parent margin + border-radius: $raven_radius $raven_radius 0 0; + } .raven-background { - background-color: rgba(black, 0.25); - margin-bottom: 0; // unset parent margin - - image { color: rgba(white, 0.15); } - - // MPRIS Applet - .raven-mpris { - background-color: rgba(black, 0.35); - color: $selected_fg_color; - border-radius: 0 0 $raven_radius $raven_radius; - - label { min-height: 24px; } - - image { //reset image color - color: rgba(white, 0.85); - &:disabled { - color: rgba(white, 0.35); - } - } - - button.image-button { - padding: 8px; - border: none; - @extend %selected-button; - } - } - } - - button.flat { - @extend %selected-button; + margin-bottom: -$raven_padding * 2; // unset parent margin + border-radius: 0 0 $raven_radius $raven_radius; + background-color: $raven_base_color; } } - // audio app/device switcher - box.audio-widget stackswitcher.linked { - padding: 0; // limit child horizontal spacing + > box.vertical > widget > box.vertical { // > = 10.7 + border-radius: $raven_radius; + background-color: $raven_header_bg_color; + border: 1px solid $raven_border_color; - > button.text-button.radio { - padding-top: $raven_padding; - padding-bottom: $raven_padding; - border-top: 1px solid $dark_borders_color; - background-color: $menu_bg; - @extend %raven_middle_button; + .raven-header { + border-radius: $raven_radius $raven_radius 0 0; + background-color: transparent; + } - &:hover { - background-color: if($variant =='light', darken($menu_bg, 5%), lighten($menu_bg, 5%)); + .raven-background { + border-radius: 0 0 $raven_radius $raven_radius; + background-color: $raven_base_color; + border-top: 1px solid $raven_border_color; + } + + image.raven-mpris { + background-color: rgba(white, 0.1); + border-radius: $raven_radius; + } + } + + .raven-mpris-controls { + margin-top: $container_padding; + + > button.image-button { + padding: $container_padding; + } + } + + @if $variant == 'light' { + > box.vertical > box.vertical:last-child, + > box.vertical > widget:last-child > box.vertical { + border: none; + background-color: rgba(black, 0.85); + color: rgba(white, 0.65); + + button { + border: none; + color: rgba(white, 0.65); + background-color: transparent; + + &:hover { + color: rgba(white, 0.85); + background-color: rgba(white, 0.15); + } + + &:active { + color: rgba(white, 0.85); + background-color: rgba(white, 0.25); + } + + &:disabled { + color: rgba(white, 0.3); + background-color: transparent; + } } - &:active, &:checked { - color: $selected_fg_color; - background-color: $selected_bg_color; + .raven-background { + background-color: rgba(white, 0.05); + margin-bottom: 0; // unset parent margin + border-top: none; } + } - &:disabled { @include button(flat-insensitive); } + // MPRIS Applet + > box.vertical > box.vertical:last-child .raven-mpris { + background-color: rgba(black, 0.35); + color: white; - &:first-child { @extend %raven_first_button; } - &:last-child { @extend %raven_last_button; } - &:only-child { @extend %raven_single_button; } + image { //reset image color + color: rgba(white, 0.85); + + &:disabled { color: rgba(white, 0.35); } + } + } + } + + > box.vertical > box.vertical:last-child .raven-mpris { + border-radius: 0 0 $raven_radius $raven_radius; + + label { min-height: 24px; } + } + + .audio-widget { + stackswitcher.linked { // audio app/device switcher + padding: 0; // limit child horizontal spacing + + > button.text-button.radio { + padding-top: $raven_padding; + padding-bottom: $raven_padding; + border-top: 1px solid $dark_borders_color; + background-color: $menu_bg; + @extend %raven_middle_button; + + &:hover { + background-color: if($variant =='light', darken($menu_bg, 5%), lighten($menu_bg, 5%)); + } + + &:active, &:checked { + color: $selected_fg_color; + background-color: $selected_bg_color; + } + + &:disabled { @include button(flat-insensitive); } + + &:first-child { @extend %raven_first_button; } + &:last-child { @extend %raven_last_button; } + &:only-child { @extend %raven_single_button; } + } + } + } + + list.devices-list { + padding: $container_padding; + background-color: transparent; + + > row.activatable { + border-radius: $bt_radius; + + label { padding: 0 $container_padding; } + + &:not(:last-child) { + margin-bottom: $container_padding / 2; + } } } } - viewport.frame .raven-header { margin-top: -$raven_padding; } - .expander-button { - border-radius: 100px; + border-radius: $circular_radius; } .raven-background { @@ -1062,21 +1179,6 @@ $raven_shadow: 0 0 3px 0 rgba(black, 0.2), 0 0 8px 0 rgba(black, 0.15), 0 0 16px } } } - - .audio-widget { - list.devices-list.sound-devices { - > row.activatable { - &:selected, &:checked { - background-color: rgba($fg_color, 0.06); - color: $fg_color; - - label { color: $fg_color; } - } - - label { padding-left: 12px; } - } - } - } } // some specific scale styling diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss index 341421e..41c753e 100644 --- a/src/sass/gtk/apps/_misc.scss +++ b/src/sass/gtk/apps/_misc.scss @@ -10,7 +10,7 @@ // Firefox and Thunderbird // -window.background:not(.csd) { +window.background:not(.csd):not(.popup) { > widget { // for the bookmark toolbar's separators > separator { @@ -659,35 +659,20 @@ menubar.-vala-panel-background { } > menu { - padding: 0; + padding: $container_padding; + separator { margin: 0; border-bottom: none; } > menuitem { - padding: 0; - margin: 0 3px; - - &:first-child { margin-top: 3px; } - &:last-child { margin-bottom: 3px; } + border-radius: $bt_radius; > window > decoration { box-shadow: none; transition: none; margin: 0; - - menu { - padding: 0; - - menuitem { - padding: 0; - margin: 0 3px; - - &:first-child { margin-top: 3px; } - &:last-child { margin-bottom: 3px; } - } - } } } } From f26502d5feb114d685b2807941dae5da5fa491e6 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sun, 26 Feb 2023 14:57:18 +0800 Subject: [PATCH 02/10] update --- src/sass/gtk/apps/_misc.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss index 41c753e..09c7adc 100644 --- a/src/sass/gtk/apps/_misc.scss +++ b/src/sass/gtk/apps/_misc.scss @@ -247,7 +247,7 @@ window.background.chromium { menu { background-color: $base_color; border-radius: 0; - border: 1px solid $solid_borders_color; + border: 1px solid if($variant == 'light', $solid_borders_color, $header_border); menuitem { border-radius: 0; From c0333a3b7411618204a575db105339f1620fd014 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sat, 4 Mar 2023 15:50:14 +0800 Subject: [PATCH 03/10] update --- src/other/firefox/Monterey/colors/dark.css | 2 +- src/other/firefox/Monterey/colors/light.css | 2 +- src/other/firefox/Monterey/parts/popups.css | 40 ++++++++++++++------- src/other/firefox/WhiteSur/colors/dark.css | 2 +- src/other/firefox/WhiteSur/colors/light.css | 2 +- src/other/firefox/WhiteSur/parts/popups.css | 40 ++++++++++++++------- 6 files changed, 58 insertions(+), 30 deletions(-) diff --git a/src/other/firefox/Monterey/colors/dark.css b/src/other/firefox/Monterey/colors/dark.css index 180e985..fe523fc 100644 --- a/src/other/firefox/Monterey/colors/dark.css +++ b/src/other/firefox/Monterey/colors/dark.css @@ -29,7 +29,7 @@ --gnome-menu-border-color: #070707; --gnome-popover-background: rgba(51, 51, 51, 0.95); --gnome-popover-border-color: #070707; - --gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), inset 0 0 0 1px rgba(255, 255, 255, 0.06); + --gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.75); --gnome-popover-button-hover-background: rgba(255, 255, 255, 0.1); --gnome-popover-button-active-background: rgba(255, 255, 255, 0.15); --gnome-popover-separator-color: rgba(0, 0, 0, 0.1); diff --git a/src/other/firefox/Monterey/colors/light.css b/src/other/firefox/Monterey/colors/light.css index 0b5b0ae..65fddb6 100644 --- a/src/other/firefox/Monterey/colors/light.css +++ b/src/other/firefox/Monterey/colors/light.css @@ -29,7 +29,7 @@ --gnome-menu-border-color: #cdc7c2; --gnome-popover-background: rgba(255, 255, 255, 0.95); --gnome-popover-border-color: #cdc7c2; - --gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3); + --gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 0 0 1px rgba(0, 0, 0, 0.12); --gnome-popover-button-hover-background: rgba(0, 0, 0, 0.1); --gnome-popover-button-active-background: rgba(0, 0, 0, 0.2); --gnome-popover-separator-color: rgba(0, 0, 0, 0.1); diff --git a/src/other/firefox/Monterey/parts/popups.css b/src/other/firefox/Monterey/parts/popups.css index 044a347..9959361 100644 --- a/src/other/firefox/Monterey/parts/popups.css +++ b/src/other/firefox/Monterey/parts/popups.css @@ -8,10 +8,8 @@ menupopup, panel, :is(menupopup, panel)[type="arrow"] { -moz-appearance: none !important; --panel-background: var(--gnome-menu-background) !important; - --panel-border-color: var(--gnome-menu-border-color) !important; --arrowpanel-border-radius: 12px !important; --arrowpanel-background: var(--gnome-menu-background) !important; - --arrowpanel-border-color: var(--gnome-menu-border-color) !important; --panel-border-radius: 12px !important; --panel-padding: 6px !important; --panel-shadow: var(--gnome-popover-shadow) !important; @@ -19,6 +17,31 @@ menupopup, panel, color: var(--gnome-toolbar-color) !important; } +menupopup, panel, +:is(menupopup, panel)[type="arrow"] +:is(panel, menupopup)::part(content) { + --panel-border-color: transparent !important; + --arrowpanel-border-color: transparent !important; + +} + +.panel-arrowcontent { + border: none !important; +} + +@media (prefers-color-scheme: dark) { +menupopup, panel, +:is(menupopup, panel)[type="arrow"] +:is(panel, menupopup)::part(content) { + --panel-border-color: rgba(255, 255, 255, 0.06) !important; + --arrowpanel-border-color: rgba(255, 255, 255, 0.06) !important; +} + +.panel-arrowcontent { + border: 1px solid rgba(255, 255, 255, 0.06) !important; +} +} + menupopup label { color: var(--gnome-toolbar-color) !important; } @@ -29,7 +52,6 @@ menupopup label { background: none !important; padding: 3px 4px 6px !important; margin: -3px 0 0 -12px !important; - border: none !important; } menubar > menu > menupopup { @@ -38,7 +60,6 @@ menubar > menu > menupopup { } menuitem, menupopup menu { - border: none !important; box-shadow: none !important; } @@ -50,14 +71,9 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover { background: transparent !important; } -:is(panel, menupopup)::part(content) { - border: none !important; -} - /* Adjust popovers position */ panel[type="arrow"] { appearance: none !important; - border: none !important; background-color: transparent !important; margin-top: 8px !important; } @@ -67,7 +83,6 @@ panel[type="arrow"] { .panel-header, .PanelUI-subView, .panel-subview-body, #widget-overflow-mainView, #protections-popup-footer, panelview { - border: none !important; background: none !important; } @@ -76,7 +91,6 @@ panelview { } #customization-panelWrapper > .panel-arrowcontent { - border: 1px solid var(--gnome-menu-border-color) !important; box-shadow: var(--gnome-popover-shadow) !important; border-radius: 12px !important; background: var(--gnome-menu-background) !important; @@ -84,7 +98,7 @@ panelview { #customization-panelWrapper > .panel-arrowbox > .panel-arrow[side="top"] { fill: var(--gnome-menu-background) !important; - stroke: var(--gnome-menu-border-color) !important; + stroke: transparent !important; } #BMB_bookmarksPopup { @@ -242,7 +256,7 @@ panelview > toolbarseparator:not([orient="vertical"]), /* Auto complete popups */ panel[type="autocomplete-richlistbox"] { background: var(--gnome-menu-background) !important; - border: 1px solid var(--gnome-menu-border-color) !important; + border: 0 !important; padding: 4px 0 !important; color: var(--gnome-toolbar-color) !important; } diff --git a/src/other/firefox/WhiteSur/colors/dark.css b/src/other/firefox/WhiteSur/colors/dark.css index 8d74239..00d3de7 100644 --- a/src/other/firefox/WhiteSur/colors/dark.css +++ b/src/other/firefox/WhiteSur/colors/dark.css @@ -30,7 +30,7 @@ --gnome-menu-border-color: #070707; --gnome-popover-background: rgba(51, 51, 51, 0.95); --gnome-popover-border-color: #070707; - --gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), inset 0 0 0 1px rgba(255, 255, 255, 0.06); + --gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.75); --gnome-popover-button-hover-background: rgba(255, 255, 255, 0.1); --gnome-popover-button-active-background: rgba(255, 255, 255, 0.15); --gnome-popover-separator-color: rgba(0, 0, 0, 0.1); diff --git a/src/other/firefox/WhiteSur/colors/light.css b/src/other/firefox/WhiteSur/colors/light.css index 6e05c69..e86d262 100644 --- a/src/other/firefox/WhiteSur/colors/light.css +++ b/src/other/firefox/WhiteSur/colors/light.css @@ -29,7 +29,7 @@ --gnome-menu-border-color: #cdc7c2; --gnome-popover-background: rgba(255, 255, 255, 0.95); --gnome-popover-border-color: #cdc7c2; - --gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3); + --gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 0 0 1px rgba(0, 0, 0, 0.12); --gnome-popover-button-hover-background: rgba(0, 0, 0, 0.1); --gnome-popover-button-active-background: rgba(0, 0, 0, 0.2); --gnome-popover-separator-color: rgba(0, 0, 0, 0.1); diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css index 044a347..9959361 100644 --- a/src/other/firefox/WhiteSur/parts/popups.css +++ b/src/other/firefox/WhiteSur/parts/popups.css @@ -8,10 +8,8 @@ menupopup, panel, :is(menupopup, panel)[type="arrow"] { -moz-appearance: none !important; --panel-background: var(--gnome-menu-background) !important; - --panel-border-color: var(--gnome-menu-border-color) !important; --arrowpanel-border-radius: 12px !important; --arrowpanel-background: var(--gnome-menu-background) !important; - --arrowpanel-border-color: var(--gnome-menu-border-color) !important; --panel-border-radius: 12px !important; --panel-padding: 6px !important; --panel-shadow: var(--gnome-popover-shadow) !important; @@ -19,6 +17,31 @@ menupopup, panel, color: var(--gnome-toolbar-color) !important; } +menupopup, panel, +:is(menupopup, panel)[type="arrow"] +:is(panel, menupopup)::part(content) { + --panel-border-color: transparent !important; + --arrowpanel-border-color: transparent !important; + +} + +.panel-arrowcontent { + border: none !important; +} + +@media (prefers-color-scheme: dark) { +menupopup, panel, +:is(menupopup, panel)[type="arrow"] +:is(panel, menupopup)::part(content) { + --panel-border-color: rgba(255, 255, 255, 0.06) !important; + --arrowpanel-border-color: rgba(255, 255, 255, 0.06) !important; +} + +.panel-arrowcontent { + border: 1px solid rgba(255, 255, 255, 0.06) !important; +} +} + menupopup label { color: var(--gnome-toolbar-color) !important; } @@ -29,7 +52,6 @@ menupopup label { background: none !important; padding: 3px 4px 6px !important; margin: -3px 0 0 -12px !important; - border: none !important; } menubar > menu > menupopup { @@ -38,7 +60,6 @@ menubar > menu > menupopup { } menuitem, menupopup menu { - border: none !important; box-shadow: none !important; } @@ -50,14 +71,9 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover { background: transparent !important; } -:is(panel, menupopup)::part(content) { - border: none !important; -} - /* Adjust popovers position */ panel[type="arrow"] { appearance: none !important; - border: none !important; background-color: transparent !important; margin-top: 8px !important; } @@ -67,7 +83,6 @@ panel[type="arrow"] { .panel-header, .PanelUI-subView, .panel-subview-body, #widget-overflow-mainView, #protections-popup-footer, panelview { - border: none !important; background: none !important; } @@ -76,7 +91,6 @@ panelview { } #customization-panelWrapper > .panel-arrowcontent { - border: 1px solid var(--gnome-menu-border-color) !important; box-shadow: var(--gnome-popover-shadow) !important; border-radius: 12px !important; background: var(--gnome-menu-background) !important; @@ -84,7 +98,7 @@ panelview { #customization-panelWrapper > .panel-arrowbox > .panel-arrow[side="top"] { fill: var(--gnome-menu-background) !important; - stroke: var(--gnome-menu-border-color) !important; + stroke: transparent !important; } #BMB_bookmarksPopup { @@ -242,7 +256,7 @@ panelview > toolbarseparator:not([orient="vertical"]), /* Auto complete popups */ panel[type="autocomplete-richlistbox"] { background: var(--gnome-menu-background) !important; - border: 1px solid var(--gnome-menu-border-color) !important; + border: 0 !important; padding: 4px 0 !important; color: var(--gnome-toolbar-color) !important; } From 5f6f8c10857e48d70400bdf8a866893793ed76f1 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sat, 4 Mar 2023 16:22:57 +0800 Subject: [PATCH 04/10] update --- .../firefox/WhiteSur/parts/buttons-fixes.css | 4 ++++ src/other/firefox/WhiteSur/parts/icons.css | 6 +++--- .../firefox/WhiteSur/parts/popups-contents.css | 5 ++++- src/other/firefox/WhiteSur/parts/tabsbar.css | 16 ++++++++++++++-- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/other/firefox/WhiteSur/parts/buttons-fixes.css b/src/other/firefox/WhiteSur/parts/buttons-fixes.css index a9abde5..a4209b1 100644 --- a/src/other/firefox/WhiteSur/parts/buttons-fixes.css +++ b/src/other/firefox/WhiteSur/parts/buttons-fixes.css @@ -183,6 +183,10 @@ button.close.ghost-button:active { margin: 4px 4px 0 4px !important; } +#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon { + margin: 3px !important; +} + /* Bookmarks editor buttons */ .expander-down image, .expander-up image { margin: 6px !important; diff --git a/src/other/firefox/WhiteSur/parts/icons.css b/src/other/firefox/WhiteSur/parts/icons.css index 310ad13..3b49a0f 100644 --- a/src/other/firefox/WhiteSur/parts/icons.css +++ b/src/other/firefox/WhiteSur/parts/icons.css @@ -4,9 +4,9 @@ /* Cursors autoscroller fix */ .autoscroller { - --panel-background: transparent !important; - --panel-border-color: transparent !important; - background-image: url("chrome://global/skin/icons/autoscroll.svg") !important; + --panel-background: transparent !important; + --panel-border-color: transparent !important; + background-image: url("chrome://global/skin/icons/autoscroll.svg") !important; } /* Built-in firefox icons color */ diff --git a/src/other/firefox/WhiteSur/parts/popups-contents.css b/src/other/firefox/WhiteSur/parts/popups-contents.css index c8ab7c8..f414a30 100644 --- a/src/other/firefox/WhiteSur/parts/popups-contents.css +++ b/src/other/firefox/WhiteSur/parts/popups-contents.css @@ -66,8 +66,11 @@ /* All tabs popover */ .all-tabs-item[selected] { box-shadow: none !important; - border-left: 3px solid var(--gnome-tabbar-tab-active-border-bottom-color); border-radius: 0 !important; + background: url("../icons/bullet-symbolic.svg") !important; + background-position: left center; + background-size: 14px 14px; + background-repeat: no-repeat; } .all-tabs-item:hover, diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css index d4ef760..b52f8d3 100644 --- a/src/other/firefox/WhiteSur/parts/tabsbar.css +++ b/src/other/firefox/WhiteSur/parts/tabsbar.css @@ -14,11 +14,12 @@ #tabbrowser-tabs, #tabbrowser-tabs arrowscrollbox { min-height: 0 !important; - --tab-min-height: 32px !important; + max-height: 32px !important; + --tab-min-height: 0 !important; } .tab-background, .tab-stack { - min-height: 32px !important; + min-height: 0 !important; } /* Extra margin for the first and last tabs */ @@ -318,6 +319,17 @@ tab[selected]:-moz-window-inactive { padding: 0 !important; } +#TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon, +#TabsToolbar .toolbarbutton-1 > .toolbarbutton-text, +#TabsToolbar .toolbarbutton-1 > .toolbarbutton-badge-stack { + padding: 8px !important; +} + +#TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon { + width: 32px !important; + height: 32px !important; +} + /* firefox-view-button */ :root:not([privatebrowsingmode="temporary"]):not([firefoxviewhidden]) :is(#firefox-view-button, #wrapper-firefox-view-button) + #tabbrowser-tabs { border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important; From 3cf7c8f528337433b82041bbd6e052196a96f8fc Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sat, 4 Mar 2023 16:38:10 +0800 Subject: [PATCH 05/10] update --- src/other/firefox/WhiteSur/parts/popups.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css index 9959361..dd98504 100644 --- a/src/other/firefox/WhiteSur/parts/popups.css +++ b/src/other/firefox/WhiteSur/parts/popups.css @@ -22,7 +22,6 @@ menupopup, panel, :is(panel, menupopup)::part(content) { --panel-border-color: transparent !important; --arrowpanel-border-color: transparent !important; - } .panel-arrowcontent { From 8116561b1cc4ad19916d49cd31bd196541e2ddd5 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sat, 4 Mar 2023 16:56:24 +0800 Subject: [PATCH 06/10] update --- .../Monterey/parts/popups-contents.css | 22 ++++++++++++---- src/other/firefox/Monterey/parts/popups.css | 1 - .../WhiteSur/parts/popups-contents.css | 25 +++++++++++++------ src/other/firefox/WhiteSur/theme.css | 2 +- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/other/firefox/Monterey/parts/popups-contents.css b/src/other/firefox/Monterey/parts/popups-contents.css index c8ab7c8..4eec137 100644 --- a/src/other/firefox/Monterey/parts/popups-contents.css +++ b/src/other/firefox/Monterey/parts/popups-contents.css @@ -64,22 +64,34 @@ } /* All tabs popover */ -.all-tabs-item[selected] { - box-shadow: none !important; - border-left: 3px solid var(--gnome-tabbar-tab-active-border-bottom-color); - border-radius: 0 !important; + +.all-tabs-item { + border-left: 3px solid transparent; } .all-tabs-item:hover, -.all-tabs-item:active { +.all-tabs-item:active, +.all-tabs-item[selected] { background: none !important; padding: 0 !important; + border-radius: 0 !important; } .all-tabs-item > .all-tabs-secondary-button { margin: 0 !important; } +.all-tabs-item[selected] { + border-image: linear-gradient( + to bottom, + transparent 0, + transparent 35%, + var(--gnome-tabbar-tab-active-border-bottom-color) 35%, + var(--gnome-tabbar-tab-active-border-bottom-color) 65%, + transparent 65%, + transparent 100%) 3; +} + .all-tabs-item > .all-tabs-secondary-button label { margin: 0 !important; } diff --git a/src/other/firefox/Monterey/parts/popups.css b/src/other/firefox/Monterey/parts/popups.css index 9959361..dd98504 100644 --- a/src/other/firefox/Monterey/parts/popups.css +++ b/src/other/firefox/Monterey/parts/popups.css @@ -22,7 +22,6 @@ menupopup, panel, :is(panel, menupopup)::part(content) { --panel-border-color: transparent !important; --arrowpanel-border-color: transparent !important; - } .panel-arrowcontent { diff --git a/src/other/firefox/WhiteSur/parts/popups-contents.css b/src/other/firefox/WhiteSur/parts/popups-contents.css index f414a30..4eec137 100644 --- a/src/other/firefox/WhiteSur/parts/popups-contents.css +++ b/src/other/firefox/WhiteSur/parts/popups-contents.css @@ -64,25 +64,34 @@ } /* All tabs popover */ -.all-tabs-item[selected] { - box-shadow: none !important; - border-radius: 0 !important; - background: url("../icons/bullet-symbolic.svg") !important; - background-position: left center; - background-size: 14px 14px; - background-repeat: no-repeat; + +.all-tabs-item { + border-left: 3px solid transparent; } .all-tabs-item:hover, -.all-tabs-item:active { +.all-tabs-item:active, +.all-tabs-item[selected] { background: none !important; padding: 0 !important; + border-radius: 0 !important; } .all-tabs-item > .all-tabs-secondary-button { margin: 0 !important; } +.all-tabs-item[selected] { + border-image: linear-gradient( + to bottom, + transparent 0, + transparent 35%, + var(--gnome-tabbar-tab-active-border-bottom-color) 35%, + var(--gnome-tabbar-tab-active-border-bottom-color) 65%, + transparent 65%, + transparent 100%) 3; +} + .all-tabs-item > .all-tabs-secondary-button label { margin: 0 !important; } diff --git a/src/other/firefox/WhiteSur/theme.css b/src/other/firefox/WhiteSur/theme.css index 109d47a..c8c529f 100644 --- a/src/other/firefox/WhiteSur/theme.css +++ b/src/other/firefox/WhiteSur/theme.css @@ -21,7 +21,7 @@ /* Set theme version text in customization panel */ #customization-footer::before { - background: url(icons/icon.svg) no-repeat; + background: url("icons/icon.svg") no-repeat; background-size: contain; content: "Firefox WhiteSur theme"; padding: 10px 10px 10px 50px; From c5b898ccc4bff9e60517e456b67b41f1742e05bb Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Tue, 7 Mar 2023 12:30:31 +0800 Subject: [PATCH 07/10] update --- src/other/firefox/Monterey/parts/icons.css | 19 +++++++++---------- src/other/firefox/WhiteSur/parts/icons.css | 9 +++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/other/firefox/Monterey/parts/icons.css b/src/other/firefox/Monterey/parts/icons.css index 25cdee5..bf3c200 100644 --- a/src/other/firefox/Monterey/parts/icons.css +++ b/src/other/firefox/Monterey/parts/icons.css @@ -4,9 +4,9 @@ /* Cursors autoscroller fix */ .autoscroller { - --panel-background: transparent !important; - --panel-border-color: transparent !important; - background-image: url("chrome://global/skin/icons/autoscroll.svg") !important; + --panel-background: transparent !important; + --panel-border-color: transparent !important; + background-image: url("chrome://global/skin/icons/autoscroll.svg") !important; } /* Built-in firefox icons color */ @@ -99,17 +99,18 @@ arrowscrollbox[orient="horizontal"] { } /* Tree views */ -treechildren::-moz-tree-twisty, -.item.client .item-twisty-container { - list-style-image: url("../icons/pan-down-symbolic.svg") !important; +treechildren::-moz-tree-twisty { + list-style-image: url("../icons/pan-end-symbolic.svg") !important; width: 16px !important; height: 16px !important; } .item.client .item-twisty-container { background-image: url("../icons/pan-end-symbolic.svg") !important; + width: 16px !important; + height: 16px !important; } treechildren::-moz-tree-twisty(open) { - list-style-image: url("../icons/pan-end-symbolic.svg") !important; + list-style-image: url("../icons/pan-down-symbolic.svg") !important; } treechildren::-moz-tree-twisty(selected, focus) { list-style-image: url("../icons/pan-down-symbolic-light.svg") !important; @@ -674,9 +675,7 @@ treechildren::-moz-tree-image { .bookmark-item[container] .toolbarbutton-icon, .menu-iconic.bookmark-item[container] .menu-iconic-icon, .panel-info-button > image, - .tab-icon-overlay, - #scrollbutton-up .toolbarbutton-icon, - #scrollbutton-down .toolbarbutton-icon { + .tab-icon-overlay { filter: invert(60%) brightness(150%); } diff --git a/src/other/firefox/WhiteSur/parts/icons.css b/src/other/firefox/WhiteSur/parts/icons.css index 3b49a0f..bf3c200 100644 --- a/src/other/firefox/WhiteSur/parts/icons.css +++ b/src/other/firefox/WhiteSur/parts/icons.css @@ -99,17 +99,18 @@ arrowscrollbox[orient="horizontal"] { } /* Tree views */ -treechildren::-moz-tree-twisty, -.item.client .item-twisty-container { - list-style-image: url("../icons/pan-down-symbolic.svg") !important; +treechildren::-moz-tree-twisty { + list-style-image: url("../icons/pan-end-symbolic.svg") !important; width: 16px !important; height: 16px !important; } .item.client .item-twisty-container { background-image: url("../icons/pan-end-symbolic.svg") !important; + width: 16px !important; + height: 16px !important; } treechildren::-moz-tree-twisty(open) { - list-style-image: url("../icons/pan-end-symbolic.svg") !important; + list-style-image: url("../icons/pan-down-symbolic.svg") !important; } treechildren::-moz-tree-twisty(selected, focus) { list-style-image: url("../icons/pan-down-symbolic-light.svg") !important; From 1b3ce38ffcf017a78380392b8d0ee2050490c0fd Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Tue, 7 Mar 2023 12:44:14 +0800 Subject: [PATCH 08/10] update --- src/other/firefox/Monterey/parts/dialogs.css | 7 ++++++- src/other/firefox/WhiteSur/parts/dialogs.css | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/other/firefox/Monterey/parts/dialogs.css b/src/other/firefox/Monterey/parts/dialogs.css index 7727728..735f19c 100644 --- a/src/other/firefox/Monterey/parts/dialogs.css +++ b/src/other/firefox/Monterey/parts/dialogs.css @@ -19,6 +19,10 @@ window { #window-modal-dialog { margin-top: auto !important; + display: flex; + justify-content: center; + align-items: center; + height: 100vh; } /* Dialog */ @@ -30,6 +34,7 @@ window { window[role="dialog"] { background: var(--gnome-toolbar-background) !important; border: 0 !important; + box-shadow: var(--gnome-popover-shadow) !important; padding: 0 !important; } @@ -39,7 +44,7 @@ dialog { dialog[subdialog] { border-radius: 12px !important; - border: 1px solid var(--gnome-popover-border-color) !important; + border: none !important; box-shadow: var(--gnome-popover-shadow) !important; } diff --git a/src/other/firefox/WhiteSur/parts/dialogs.css b/src/other/firefox/WhiteSur/parts/dialogs.css index 7727728..735f19c 100644 --- a/src/other/firefox/WhiteSur/parts/dialogs.css +++ b/src/other/firefox/WhiteSur/parts/dialogs.css @@ -19,6 +19,10 @@ window { #window-modal-dialog { margin-top: auto !important; + display: flex; + justify-content: center; + align-items: center; + height: 100vh; } /* Dialog */ @@ -30,6 +34,7 @@ window { window[role="dialog"] { background: var(--gnome-toolbar-background) !important; border: 0 !important; + box-shadow: var(--gnome-popover-shadow) !important; padding: 0 !important; } @@ -39,7 +44,7 @@ dialog { dialog[subdialog] { border-radius: 12px !important; - border: 1px solid var(--gnome-popover-border-color) !important; + border: none !important; box-shadow: var(--gnome-popover-shadow) !important; } From f9dce4503d9119689277d7b41926c422f9bb6be5 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Tue, 7 Mar 2023 12:50:48 +0800 Subject: [PATCH 09/10] update --- src/other/firefox/Monterey/parts/toolbox-alt.css | 7 +++++++ src/other/firefox/Monterey/parts/toolbox.css | 7 +++++++ src/other/firefox/WhiteSur/parts/toolbox.css | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/src/other/firefox/Monterey/parts/toolbox-alt.css b/src/other/firefox/Monterey/parts/toolbox-alt.css index b0d135a..604e09a 100644 --- a/src/other/firefox/Monterey/parts/toolbox-alt.css +++ b/src/other/firefox/Monterey/parts/toolbox-alt.css @@ -80,6 +80,13 @@ findbar:-moz-window-inactive { -moz-box-ordinal-group: 100; } +/* Sidebar */ +#sidebar-box, +.sidebar-panel[lwt-sidebar] { + color: var(--gnome-toolbar-color) !important; + background: var(--gnome-toolbar-background) !important; +} + #PersonalToolbar { padding: 0 3px 3px !important; height: 32px !important; diff --git a/src/other/firefox/Monterey/parts/toolbox.css b/src/other/firefox/Monterey/parts/toolbox.css index 9dd2f5d..3fc8498 100644 --- a/src/other/firefox/Monterey/parts/toolbox.css +++ b/src/other/firefox/Monterey/parts/toolbox.css @@ -91,6 +91,13 @@ findbar:-moz-window-inactive, max-height: 32px !important; } +/* Sidebar */ +#sidebar-box, +.sidebar-panel[lwt-sidebar] { + color: var(--gnome-toolbar-color) !important; + background: var(--gnome-toolbar-background) !important; +} + /* bookmark-item */ toolbarbutton.bookmark-item { padding: 3px 6px !important; diff --git a/src/other/firefox/WhiteSur/parts/toolbox.css b/src/other/firefox/WhiteSur/parts/toolbox.css index e443a0e..280f47a 100644 --- a/src/other/firefox/WhiteSur/parts/toolbox.css +++ b/src/other/firefox/WhiteSur/parts/toolbox.css @@ -102,6 +102,13 @@ findbar:-moz-window-inactive label, max-height: 32px !important; } +/* Sidebar */ +#sidebar-box, +.sidebar-panel[lwt-sidebar] { + color: var(--gnome-toolbar-color) !important; + background: var(--gnome-toolbar-background) !important; +} + /* bookmark-item */ toolbarbutton.bookmark-item { padding: 3px 6px !important; From 8d1a8aaddc465d29622dc50fe6b5d93b5f516d30 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Tue, 7 Mar 2023 14:41:01 +0800 Subject: [PATCH 10/10] update --- install.sh | 6 +++--- src/other/firefox/Monterey/parts/toolbox-alt.css | 12 ++++++++++++ src/other/firefox/Monterey/parts/toolbox.css | 12 ++++++++++++ src/other/firefox/WhiteSur/parts/toolbox.css | 12 ++++++++++++ 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 0073d9a..084563c 100755 --- a/install.sh +++ b/install.sh @@ -200,9 +200,9 @@ else echo; prompt -w "${final_msg}" - if has_command notify-send && [[ "$UID" != '0' ]]; then - notify-send "'${name}' theme has been installed. Enjoy!" "${notif_msg}" -i "dialog-information-symbolic" - fi +# if has_command notify-send && [[ "$UID" != '0' ]]; then +# notify-send "'${name}' theme has been installed. Enjoy!" "${notif_msg}" -i "dialog-information-symbolic" +# fi fi echo diff --git a/src/other/firefox/Monterey/parts/toolbox-alt.css b/src/other/firefox/Monterey/parts/toolbox-alt.css index 604e09a..70d2d43 100644 --- a/src/other/firefox/Monterey/parts/toolbox-alt.css +++ b/src/other/firefox/Monterey/parts/toolbox-alt.css @@ -87,6 +87,18 @@ findbar:-moz-window-inactive { background: var(--gnome-toolbar-background) !important; } +/* Customization page */ +#customization-container:-moz-lwtheme { + background-image: linear-gradient(var(--gnome-browser-before-load-background), var(--gnome-browser-before-load-background)) !important; +} + +#customization-footer { + border-top: 1px solid var(--gnome-toolbar-border-color) !important; + color: var(--gnome-toolbar-color) !important; + background: var(--gnome-toolbar-background) !important; + border-radius: 0 0 12px 12px !important; +} + #PersonalToolbar { padding: 0 3px 3px !important; height: 32px !important; diff --git a/src/other/firefox/Monterey/parts/toolbox.css b/src/other/firefox/Monterey/parts/toolbox.css index 3fc8498..09647eb 100644 --- a/src/other/firefox/Monterey/parts/toolbox.css +++ b/src/other/firefox/Monterey/parts/toolbox.css @@ -98,6 +98,18 @@ findbar:-moz-window-inactive, background: var(--gnome-toolbar-background) !important; } +/* Customization page */ +#customization-container:-moz-lwtheme { + background-image: linear-gradient(var(--gnome-browser-before-load-background), var(--gnome-browser-before-load-background)) !important; +} + +#customization-footer { + border-top: 1px solid var(--gnome-toolbar-border-color) !important; + color: var(--gnome-toolbar-color) !important; + background: var(--gnome-toolbar-background) !important; + border-radius: 0 0 12px 12px !important; +} + /* bookmark-item */ toolbarbutton.bookmark-item { padding: 3px 6px !important; diff --git a/src/other/firefox/WhiteSur/parts/toolbox.css b/src/other/firefox/WhiteSur/parts/toolbox.css index 280f47a..745056e 100644 --- a/src/other/firefox/WhiteSur/parts/toolbox.css +++ b/src/other/firefox/WhiteSur/parts/toolbox.css @@ -109,6 +109,18 @@ findbar:-moz-window-inactive label, background: var(--gnome-toolbar-background) !important; } +/* Customization page */ +#customization-container:-moz-lwtheme { + background-image: linear-gradient(var(--gnome-browser-before-load-background), var(--gnome-browser-before-load-background)) !important; +} + +#customization-footer { + border-top: 1px solid var(--gnome-toolbar-border-color) !important; + color: var(--gnome-toolbar-color) !important; + background: var(--gnome-toolbar-background) !important; + border-radius: 0 0 12px 12px !important; +} + /* bookmark-item */ toolbarbutton.bookmark-item { padding: 3px 6px !important;