From 438ed35885e4de88d1fbc940025cc1106e42b67a Mon Sep 17 00:00:00 2001 From: halfmexican <103920890+halfmexican@users.noreply.github.com> Date: Tue, 20 Sep 2022 22:26:20 -0500 Subject: [PATCH 1/2] Fix incorrectly colored close button also changes button active color --- curated/pop-light.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/curated/pop-light.json b/curated/pop-light.json index 180162e..0d95ffa 100644 --- a/curated/pop-light.json +++ b/curated/pop-light.json @@ -101,7 +101,7 @@ } }, "custom_css": { - "gtk4": "windowcontrols image {\n background-color: transparent;\n}\n \n/* If you want to keep the circles when you hover: */\nwindowcontrols image:hover {\n background-color: alpha(@headerbar_fg_color, 0.10);\n}\n\n/* When the buttons are pushed down: */\nwindowcontrols image:active {\n background-color: alpha(@headerbar_fg_color, 0.16);\n}\n\nheaderbar windowcontrols button.close image {\n background-color: #f28c2a;\n}\n\nheaderbar windowcontrols button.close image:hover {\n background-color: #5e5e5e;\n}\n\nheaderbar:backdrop windowcontrols button.close image {\n background-color: transparent;\n}\n\nheaderbar:backdrop windowcontrols button.close image:hover {\n background-color: alpha(@headerbar_fg_color, 0.10);\n}\n\nswitch slider {\n\tbackground-color: #f6f6f6;\n}\n\nswitch {\n\tbackground-color: #a9a9a9;\n}\n\nswitch:checked {\n\n\tbackground-color: #ffad00;\n}\n\ncheckbutton check:checked{\n\tcolor: #363636;\n\tbackground-color:#ffad00;\n}\n\nscale highlight{\n\tbackground-color: #48b9c7;\n\n}\n\nscale slider{\n\tbackground-color: #48b9c7;\n}", + "gtk4": "windowcontrols image {\n background-color: transparent;\n} \n/* If you want to keep the circles when you hover: */\nwindowcontrols image:hover {\n background-color: alpha(@headerbar_fg_color, 0.16);\n}\n/* When the buttons are pushed down: */\nwindowcontrols image:active {\n background-color: alpha(@headerbar_fg_color, 0.10);\n}\nheaderbar windowcontrols button.close image {\n background-color: #f28c2a;\n}\nheaderbar windowcontrols button.close image:hover {\n background-color: alpha(@headerbar_fg_color, 0.16);\n}\nheaderbar windowcontrols button.close image:active {\n background-color: alpha(@headerbar_fg_color, 0.10);\n}\nheaderbar:backdrop windowcontrols button.close image {\n background-color: transparent;\n}\nheaderbar:backdrop windowcontrols button.close image:hover {\n background-color: alpha(@headerbar_fg_color, 0.10);\n}\nswitch slider {\n\tbackground-color: #f6f6f6;\n}\nswitch {\n\tbackground-color: #a9a9a9;\n}\nswitch:checked {\n\n\tbackground-color: #ffad00;\n}\ncheckbutton check:checked{\n\tcolor: #363636;\n\tbackground-color:#ffad00;\n}\nscale highlight{\n\tbackground-color: #48b9c7;\n\n}\nscale slider{\n\tbackground-color: #48b9c7;\n}", "gtk3": "" } -} +} \ No newline at end of file From d785a13b6fbbda23f11afe9a7b299bbbfda71075 Mon Sep 17 00:00:00 2001 From: halfmexican <103920890+halfmexican@users.noreply.github.com> Date: Tue, 20 Sep 2022 22:29:16 -0500 Subject: [PATCH 2/2] Change card color to match GTK theme also changes headerbear windowcontrol active colors --- curated/pop-dark.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/curated/pop-dark.json b/curated/pop-dark.json index f2a6d76..2f0860f 100644 --- a/curated/pop-dark.json +++ b/curated/pop-dark.json @@ -25,9 +25,9 @@ "headerbar_border_color": "#ffffff", "headerbar_backdrop_color": "rgb(54,54,54)", "headerbar_shade_color": "rgba(0, 0, 0, 0.36)", - "card_bg_color": "rgba(255, 255, 255, 0.08)", + "card_bg_color": "rgb(39,39,39)", "card_fg_color": "#ffffff", - "card_shade_color": "rgba(0, 0, 0, 0.36)", + "card_shade_color": "rgba(0,0,0,0.36)", "dialog_bg_color": "#383838", "dialog_fg_color": "#ffffff", "popover_bg_color": "rgb(43,43,43)", @@ -101,7 +101,7 @@ } }, "custom_css": { - "gtk4": "windowcontrols image {\n background-color: transparent;\n}\n \n/* If you want to keep the circles when you hover: */\nwindowcontrols image:hover {\n background-color: alpha(@headerbar_fg_color, 0.10);\n}\n\n/* When the buttons are pushed down: */\nwindowcontrols image:active {\n background-color: alpha(@headerbar_fg_color, 0.16);\n}\n\nheaderbar windowcontrols button.close image {\n background-color: #f28c2a;\n}\n\nheaderbar windowcontrols button.close image:hover {\n background-color: #5e5e5e;\n}\n\nheaderbar:backdrop windowcontrols button.close image {\n background-color: transparent;\n}\n\nheaderbar:backdrop windowcontrols button.close image:hover {\n background-color: alpha(@headerbar_fg_color, 0.10);\n}\n\nswitch slider {\n\tbackground-color: #363636;\n}\n\nswitch {\n\tbackground-color: #686868;\n}\n\nswitch:checked {\n\n\tbackground-color: #fbb86c;\n}\n\ncheckbutton check:checked{\n\tcolor: #363636;\n}\n\nscale highlight{\n\tbackground-color: #94ebeb;\n\n}\n\nscale slider{\n\tbackground-color: #94ebeb;\n}", + "gtk4": "windowcontrols image {\n background-color: transparent;\n}\n/* If you want to keep the circles when you hover: */\nwindowcontrols image:hover {\n background-color: alpha(@headerbar_fg_color, 0.16);\n}\n/* When the buttons are pushed down: */\nwindowcontrols image:active {\n background-color: alpha(@headerbar_fg_color, 0.10);\n}\nheaderbar windowcontrols button.close image {\n background-color: #f28c2a;\n}\nheaderbar windowcontrols button.close image:hover {\n background-color: #5e5e5e;\n}\nheaderbar windowcontrols button.close image:active {\n background-color: alpha(@headerbar_fg_color, 0.10);\n}\nheaderbar:backdrop windowcontrols button.close image {\n background-color: transparent;\n}\nheaderbar:backdrop windowcontrols button.close image:hover {\n background-color: alpha(@headerbar_fg_color, 0.10);\n}\nswitch slider {\n\tbackground-color: #363636;\n}\nswitch {\n\tbackground-color: #686868;\n}\nswitch:checked {\n\n\tbackground-color: #fbb86c;\n}\ncheckbutton check:checked{\n\tcolor: #363636;\n}\n\nscale highlight{\n\tbackground-color: #94ebeb;\n\n}\nscale slider{\n\tbackground-color: #94ebeb;\n}", "gtk3": "" } -} +} \ No newline at end of file