From ed261ce79f048d0bbf25ee01c755647cffa6e56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Wed, 22 Dec 2021 16:02:54 +0100 Subject: [PATCH] GTK3: fix hovered titlebuttons in firefox --- .../Kali-Dark/gtk-3.0/assets/close-black.png | Bin 0 -> 128 bytes .../gtk-3.0/assets/close-black@2.png | Bin 0 -> 195 bytes .../Kali-Dark/gtk-3.0/assets/close-white.png | Bin 0 -> 133 bytes .../gtk-3.0/assets/close-white@2.png | Bin 0 -> 193 bytes .../gtk-3.0/assets/maximize-dark.png | Bin 0 -> 139 bytes .../gtk-3.0/assets/maximize-dark@2.png | Bin 0 -> 210 bytes .../Kali-Dark/gtk-3.0/assets/maximize.png | Bin 0 -> 142 bytes .../Kali-Dark/gtk-3.0/assets/maximize@2.png | Bin 0 -> 210 bytes .../gtk-3.0/assets/minimize-dark.png | Bin 0 -> 80 bytes .../gtk-3.0/assets/minimize-dark@2.png | Bin 0 -> 89 bytes .../Kali-Dark/gtk-3.0/assets/minimize.png | Bin 0 -> 80 bytes .../Kali-Dark/gtk-3.0/assets/minimize@2.png | Bin 0 -> 93 bytes .../Kali-Dark/gtk-3.0/assets/titlebutton.png | Bin 0 -> 72 bytes .../gtk-3.0/assets/titlebutton@2.png | Bin 0 -> 74 bytes share/themes/Kali-Dark/gtk-3.0/gtk.css | 33 +++++++++----- share/themes/Kali-Light/gtk-3.0/gtk-dark.css | 33 +++++++++----- share/themes/Kali-Light/gtk-3.0/gtk.css | 33 +++++++++----- .../Kali/assets-renderer/gtk3/assets.svg | 15 ++++++- .../Kali/assets-renderer/gtk3/assets.txt | 7 +++ src/themes/Kali/sass/gtk3/_common-tweaks.scss | 42 +++++++++++++----- 20 files changed, 113 insertions(+), 50 deletions(-) create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/close-black.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/close-black@2.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/close-white.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/close-white@2.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/maximize-dark.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/maximize-dark@2.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/maximize.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/maximize@2.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/minimize-dark.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/minimize-dark@2.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/minimize.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/minimize@2.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/titlebutton.png create mode 100644 share/themes/Kali-Dark/gtk-3.0/assets/titlebutton@2.png diff --git a/share/themes/Kali-Dark/gtk-3.0/assets/close-black.png b/share/themes/Kali-Dark/gtk-3.0/assets/close-black.png new file mode 100644 index 0000000000000000000000000000000000000000..c641034205c105f22cf08f1c8079dd6514774daf GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^93afW0wnX;%77$;yQhm|2!|}|!GpYq7NWqoRSJg6=NXTH%=C2ib6Mw<&;$S|&L~R& literal 0 HcmV?d00001 diff --git a/share/themes/Kali-Dark/gtk-3.0/assets/close-black@2.png b/share/themes/Kali-Dark/gtk-3.0/assets/close-black@2.png new file mode 100644 index 0000000000000000000000000000000000000000..88d2d2c76fa2483c662677533bde9b7e1f213076 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^{25*WIxq@$MLAuXE@*M7=91(?_zQ-*jUH>F8jf|$>&)MbPG-% vynEN~%eiXxoF@-*$`wDnUoXY9r;br!b6t2q(2R1Rs~9|8{an^LB{Ts57%WeL literal 0 HcmV?d00001 diff --git a/share/themes/Kali-Dark/gtk-3.0/assets/close-white.png b/share/themes/Kali-Dark/gtk-3.0/assets/close-white.png new file mode 100644 index 0000000000000000000000000000000000000000..8ea117d6d5a3ccfc09a1c6f1f1ea67da91eb7703 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^93afW0wnX;%77$;kEe@c2!|}|!GpZb0X(c5wzDjJ zv!8Rt@;2_DLXUTp)ok?=+I?HJH}KRU{Zoe|dc2Z8H(Xcu1d$V6A|;xaJ~|e3YQf`6 d-&6u`{bbL*5`DU_;>TBz!Je*uF6*2UngCB1G1dS8 literal 0 HcmV?d00001 diff --git a/share/themes/Kali-Dark/gtk-3.0/assets/close-white@2.png b/share/themes/Kali-Dark/gtk-3.0/assets/close-white@2.png new file mode 100644 index 0000000000000000000000000000000000000000..05da08cdcab37947801c1afd98c2db9909ffbe70 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^{2tczargdWNJP%*hdWb%|RcT_%noL5uNx#MB0WUK~UJ!uL*{`nDu(0((8rF&>+12ewTwychX7m3v$1 t?TMDz_c#3fkjH;9;r;qq8y@^(737GY^m5%>OQ4$=JYD@<);T3K0RT&TPTv3k literal 0 HcmV?d00001 diff --git a/share/themes/Kali-Dark/gtk-3.0/assets/maximize-dark.png b/share/themes/Kali-Dark/gtk-3.0/assets/maximize-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..5680438241c265a302723034632bbf386d6547d1 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqL7py-Are!QYrelb8_34Srp>nI z!T-Qxx6ar0W@O1TaS?83{1ON@9E!zM9 literal 0 HcmV?d00001 diff --git a/share/themes/Kali-Dark/gtk-3.0/assets/maximize-dark@2.png b/share/themes/Kali-Dark/gtk-3.0/assets/maximize-dark@2.png new file mode 100644 index 0000000000000000000000000000000000000000..b06e0dec405cbea74c759b49450f71fdf2b21550 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^{2A^89ChW$Vdd?i7C!3<&H5xe(axODCMjhC-pSML^y2g^k zWoOD4k$BfA`JT_f;YB%rLywsFbUT5^s?5yH)*T;3P9&&K`^dFo26v8MSNCZf1Lmwx jmK@2<&3rTJbQu`Jm-}4*(6rnLXd;8BtDnm{r-UW|xd2_I literal 0 HcmV?d00001 diff --git a/share/themes/Kali-Dark/gtk-3.0/assets/maximize.png b/share/themes/Kali-Dark/gtk-3.0/assets/maximize.png new file mode 100644 index 0000000000000000000000000000000000000000..55849723d5908b991848d55581817fe5716a9fc5 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U4q5(c3u0T38xiBs+J0>wVCMhQ- z5y;5-D|$c&D8W_|UH&Qk$9kto2QFo2uF1ChFW%} zd=ZIvjgs&A3>;pR^EdQ}iBGo^c&y6I%xvB9QRGB|>a>qsD`s%#_;q!kwlQGN`eezG h%-qa3qfVEBA$+;d^$$(UjesUHc)I$ztaD0e0st@eMWz4% literal 0 HcmV?d00001 diff --git a/share/themes/Kali-Dark/gtk-3.0/assets/minimize-dark.png b/share/themes/Kali-Dark/gtk-3.0/assets/minimize-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..b6fe877a9b04e910d87b08cfd74bd1946ecfeab0 GIT binary patch literal 80 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFq;+`&!Are!Q6D0T=KHlAJ{{N$9 df>H_-!^Z&T)6GAsQ2t6C_v{CtP4UR{s8; m%mSCs^+l$}6IV}6I?KR%o;_@9VoerMErX}4pUXO@geCx&>KPjV literal 0 HcmV?d00001 diff --git a/share/themes/Kali-Dark/gtk-3.0/assets/minimize.png b/share/themes/Kali-Dark/gtk-3.0/assets/minimize.png new file mode 100644 index 0000000000000000000000000000000000000000..808cc6d0a518c1290f02de5d4c3517538abf36ae GIT binary patch literal 80 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFq;+`&!Are!Q6D0T=4Al&u+uO1F cwD>SEbk;HH?EAm}KTrvSr>mdKI;Vst0B9)_761SM literal 0 HcmV?d00001 diff --git a/share/themes/Kali-Dark/gtk-3.0/assets/minimize@2.png b/share/themes/Kali-Dark/gtk-3.0/assets/minimize@2.png new file mode 100644 index 0000000000000000000000000000000000000000..57d05d15e9c8bc20527577e1ba078fc82b157c84 GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^{2nq<6&T2$7G}ud*~KWJ%gvKpUXO@geCyWYZ!8bg=d#Wzp$P!cOAdkn literal 0 HcmV?d00001 diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css index a743f5b7..a54ed070 100644 --- a/share/themes/Kali-Dark/gtk-3.0/gtk.css +++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css @@ -5487,7 +5487,10 @@ dialog .titlebar:not(headerbar), dialog headerbar, dialog headerbar:backdrop { .titlebar:not(headerbar) button.titlebutton:not(.appmenu), headerbar button.titlebutton:not(.appmenu) { color: transparent; - background: #383d4b; + background-image: -gtk-scaled(url("assets/titlebutton.png"), url("assets/titlebutton@2.png")); + background-color: #383d4b; + background-repeat: no-repeat; + background-position: center; margin: 0; margin-left: 5px; padding: 0; @@ -5505,30 +5508,36 @@ headerbar button.titlebutton:not(.appmenu) { margin-right: 5px; } .titlebar:not(headerbar) button.titlebutton:not(.appmenu):hover, headerbar button.titlebutton:not(.appmenu):hover { - color: #eeeeec; - background: #383d4b; + background-color: #383d4b; border-color: transparent; box-shadow: 0 0 0 1px #0d0e11; } + .titlebar:not(headerbar) button.titlebutton:not(.appmenu):hover.minimize, + headerbar button.titlebutton:not(.appmenu):hover.minimize { + background-image: -gtk-scaled(url("assets/minimize-dark.png"), url("assets/minimize-dark@2.png")); } + .titlebar:not(headerbar) button.titlebutton:not(.appmenu):hover.maximize, + headerbar button.titlebutton:not(.appmenu):hover.maximize { + background-image: -gtk-scaled(url("assets/maximize-dark.png"), url("assets/maximize-dark@2.png")); } .titlebar:not(headerbar) button.titlebutton:not(.appmenu).close, headerbar button.titlebutton:not(.appmenu).close { - color: black; - background: #2777ff; + background-color: #2777ff; + background-image: -gtk-scaled(url("assets/close-black.png"), url("assets/close-black@2.png")); border-color: transparent; } .titlebar:not(headerbar) button.titlebutton:not(.appmenu).close:hover, headerbar button.titlebutton:not(.appmenu).close:hover { - color: white; - background: #3d85ff; } + background-color: #3d85ff; + background-image: -gtk-scaled(url("assets/close-white.png"), url("assets/close-white@2.png")); } .maximized .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .fullscreen .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-top .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-right .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-bottom .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-left .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .maximized headerbar button.titlebutton:not(.appmenu):last-child, .fullscreen headerbar button.titlebutton:not(.appmenu):last-child, .tiled headerbar button.titlebutton:not(.appmenu):last-child, .tiled-top headerbar button.titlebutton:not(.appmenu):last-child, .tiled-right headerbar button.titlebutton:not(.appmenu):last-child, .tiled-bottom headerbar button.titlebutton:not(.appmenu):last-child, .tiled-left headerbar button.titlebutton:not(.appmenu):last-child { margin-right: 0; } .maximized .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .fullscreen .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-top .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-right .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-bottom .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-left .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .maximized headerbar button.titlebutton:not(.appmenu):first-child, .fullscreen headerbar button.titlebutton:not(.appmenu):first-child, .tiled headerbar button.titlebutton:not(.appmenu):first-child, .tiled-top headerbar button.titlebutton:not(.appmenu):first-child, .tiled-right headerbar button.titlebutton:not(.appmenu):first-child, .tiled-bottom headerbar button.titlebutton:not(.appmenu):first-child, .tiled-left headerbar button.titlebutton:not(.appmenu):first-child { margin-left: 0; } - .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop, - headerbar button.titlebutton:not(.appmenu):backdrop { - color: transparent; - background: transparent; + .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop.maximize, .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop.minimize, .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop.close, + headerbar button.titlebutton:not(.appmenu):backdrop.maximize, + headerbar button.titlebutton:not(.appmenu):backdrop.minimize, + headerbar button.titlebutton:not(.appmenu):backdrop.close { box-shadow: none; border-color: #0d0e11; - background: rgba(0, 0, 0, 0.3); } + background-image: -gtk-scaled(url("assets/titlebutton.png"), url("assets/titlebutton@2.png")); + background-color: rgba(0, 0, 0, 0.3); } .default-decoration.titlebar:not(headerbar), headerbar.default-decoration { diff --git a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css index a743f5b7..a54ed070 100644 --- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css +++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css @@ -5487,7 +5487,10 @@ dialog .titlebar:not(headerbar), dialog headerbar, dialog headerbar:backdrop { .titlebar:not(headerbar) button.titlebutton:not(.appmenu), headerbar button.titlebutton:not(.appmenu) { color: transparent; - background: #383d4b; + background-image: -gtk-scaled(url("assets/titlebutton.png"), url("assets/titlebutton@2.png")); + background-color: #383d4b; + background-repeat: no-repeat; + background-position: center; margin: 0; margin-left: 5px; padding: 0; @@ -5505,30 +5508,36 @@ headerbar button.titlebutton:not(.appmenu) { margin-right: 5px; } .titlebar:not(headerbar) button.titlebutton:not(.appmenu):hover, headerbar button.titlebutton:not(.appmenu):hover { - color: #eeeeec; - background: #383d4b; + background-color: #383d4b; border-color: transparent; box-shadow: 0 0 0 1px #0d0e11; } + .titlebar:not(headerbar) button.titlebutton:not(.appmenu):hover.minimize, + headerbar button.titlebutton:not(.appmenu):hover.minimize { + background-image: -gtk-scaled(url("assets/minimize-dark.png"), url("assets/minimize-dark@2.png")); } + .titlebar:not(headerbar) button.titlebutton:not(.appmenu):hover.maximize, + headerbar button.titlebutton:not(.appmenu):hover.maximize { + background-image: -gtk-scaled(url("assets/maximize-dark.png"), url("assets/maximize-dark@2.png")); } .titlebar:not(headerbar) button.titlebutton:not(.appmenu).close, headerbar button.titlebutton:not(.appmenu).close { - color: black; - background: #2777ff; + background-color: #2777ff; + background-image: -gtk-scaled(url("assets/close-black.png"), url("assets/close-black@2.png")); border-color: transparent; } .titlebar:not(headerbar) button.titlebutton:not(.appmenu).close:hover, headerbar button.titlebutton:not(.appmenu).close:hover { - color: white; - background: #3d85ff; } + background-color: #3d85ff; + background-image: -gtk-scaled(url("assets/close-white.png"), url("assets/close-white@2.png")); } .maximized .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .fullscreen .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-top .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-right .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-bottom .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-left .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .maximized headerbar button.titlebutton:not(.appmenu):last-child, .fullscreen headerbar button.titlebutton:not(.appmenu):last-child, .tiled headerbar button.titlebutton:not(.appmenu):last-child, .tiled-top headerbar button.titlebutton:not(.appmenu):last-child, .tiled-right headerbar button.titlebutton:not(.appmenu):last-child, .tiled-bottom headerbar button.titlebutton:not(.appmenu):last-child, .tiled-left headerbar button.titlebutton:not(.appmenu):last-child { margin-right: 0; } .maximized .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .fullscreen .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-top .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-right .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-bottom .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-left .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .maximized headerbar button.titlebutton:not(.appmenu):first-child, .fullscreen headerbar button.titlebutton:not(.appmenu):first-child, .tiled headerbar button.titlebutton:not(.appmenu):first-child, .tiled-top headerbar button.titlebutton:not(.appmenu):first-child, .tiled-right headerbar button.titlebutton:not(.appmenu):first-child, .tiled-bottom headerbar button.titlebutton:not(.appmenu):first-child, .tiled-left headerbar button.titlebutton:not(.appmenu):first-child { margin-left: 0; } - .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop, - headerbar button.titlebutton:not(.appmenu):backdrop { - color: transparent; - background: transparent; + .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop.maximize, .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop.minimize, .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop.close, + headerbar button.titlebutton:not(.appmenu):backdrop.maximize, + headerbar button.titlebutton:not(.appmenu):backdrop.minimize, + headerbar button.titlebutton:not(.appmenu):backdrop.close { box-shadow: none; border-color: #0d0e11; - background: rgba(0, 0, 0, 0.3); } + background-image: -gtk-scaled(url("assets/titlebutton.png"), url("assets/titlebutton@2.png")); + background-color: rgba(0, 0, 0, 0.3); } .default-decoration.titlebar:not(headerbar), headerbar.default-decoration { diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css index 2bc12fb1..437e2c1f 100644 --- a/share/themes/Kali-Light/gtk-3.0/gtk.css +++ b/share/themes/Kali-Light/gtk-3.0/gtk.css @@ -5508,7 +5508,10 @@ dialog .titlebar:not(headerbar), dialog headerbar, dialog headerbar:backdrop { .titlebar:not(headerbar) button.titlebutton:not(.appmenu), headerbar button.titlebutton:not(.appmenu) { color: transparent; - background: white; + background-image: -gtk-scaled(url("assets/titlebutton.png"), url("assets/titlebutton@2.png")); + background-color: white; + background-repeat: no-repeat; + background-position: center; margin: 0; margin-left: 5px; padding: 0; @@ -5526,30 +5529,36 @@ headerbar button.titlebutton:not(.appmenu) { margin-right: 5px; } .titlebar:not(headerbar) button.titlebutton:not(.appmenu):hover, headerbar button.titlebutton:not(.appmenu):hover { - color: #5c616c; - background: white; + background-color: white; border-color: transparent; box-shadow: 0 0 0 1px #d9d9d9; } + .titlebar:not(headerbar) button.titlebutton:not(.appmenu):hover.minimize, + headerbar button.titlebutton:not(.appmenu):hover.minimize { + background-image: -gtk-scaled(url("assets/minimize.png"), url("assets/minimize@2.png")); } + .titlebar:not(headerbar) button.titlebutton:not(.appmenu):hover.maximize, + headerbar button.titlebutton:not(.appmenu):hover.maximize { + background-image: -gtk-scaled(url("assets/maximize.png"), url("assets/maximize@2.png")); } .titlebar:not(headerbar) button.titlebutton:not(.appmenu).close, headerbar button.titlebutton:not(.appmenu).close { - color: white; - background: #2777ff; + background-color: #2777ff; + background-image: -gtk-scaled(url("assets/close-white.png"), url("assets/close-white@2.png")); border-color: transparent; } .titlebar:not(headerbar) button.titlebutton:not(.appmenu).close:hover, headerbar button.titlebutton:not(.appmenu).close:hover { - color: black; - background: #3d85ff; } + background-color: #3d85ff; + background-image: -gtk-scaled(url("assets/close-black.png"), url("assets/close-black@2.png")); } .maximized .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .fullscreen .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-top .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-right .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-bottom .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .tiled-left .titlebar:not(headerbar) button.titlebutton:not(.appmenu):last-child, .maximized headerbar button.titlebutton:not(.appmenu):last-child, .fullscreen headerbar button.titlebutton:not(.appmenu):last-child, .tiled headerbar button.titlebutton:not(.appmenu):last-child, .tiled-top headerbar button.titlebutton:not(.appmenu):last-child, .tiled-right headerbar button.titlebutton:not(.appmenu):last-child, .tiled-bottom headerbar button.titlebutton:not(.appmenu):last-child, .tiled-left headerbar button.titlebutton:not(.appmenu):last-child { margin-right: 0; } .maximized .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .fullscreen .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-top .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-right .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-bottom .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .tiled-left .titlebar:not(headerbar) button.titlebutton:not(.appmenu):first-child, .maximized headerbar button.titlebutton:not(.appmenu):first-child, .fullscreen headerbar button.titlebutton:not(.appmenu):first-child, .tiled headerbar button.titlebutton:not(.appmenu):first-child, .tiled-top headerbar button.titlebutton:not(.appmenu):first-child, .tiled-right headerbar button.titlebutton:not(.appmenu):first-child, .tiled-bottom headerbar button.titlebutton:not(.appmenu):first-child, .tiled-left headerbar button.titlebutton:not(.appmenu):first-child { margin-left: 0; } - .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop, - headerbar button.titlebutton:not(.appmenu):backdrop { - color: transparent; - background: transparent; + .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop.maximize, .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop.minimize, .titlebar:not(headerbar) button.titlebutton:not(.appmenu):backdrop.close, + headerbar button.titlebutton:not(.appmenu):backdrop.maximize, + headerbar button.titlebutton:not(.appmenu):backdrop.minimize, + headerbar button.titlebutton:not(.appmenu):backdrop.close { box-shadow: none; border-color: #d9d9d9; - background: rgba(0, 0, 0, 0.1); } + background-image: -gtk-scaled(url("assets/titlebutton.png"), url("assets/titlebutton@2.png")); + background-color: rgba(0, 0, 0, 0.1); } .default-decoration.titlebar:not(headerbar), headerbar.default-decoration { diff --git a/src/themes/Kali/assets-renderer/gtk3/assets.svg b/src/themes/Kali/assets-renderer/gtk3/assets.svg index 39c0bb20..f9aa445f 100644 --- a/src/themes/Kali/assets-renderer/gtk3/assets.svg +++ b/src/themes/Kali/assets-renderer/gtk3/assets.svg @@ -23,8 +23,6 @@ - - @@ -348,4 +346,17 @@ + + + + + + + + + + + + + diff --git a/src/themes/Kali/assets-renderer/gtk3/assets.txt b/src/themes/Kali/assets-renderer/gtk3/assets.txt index 245e3a87..87510c37 100644 --- a/src/themes/Kali/assets-renderer/gtk3/assets.txt +++ b/src/themes/Kali/assets-renderer/gtk3/assets.txt @@ -1,3 +1,10 @@ +minimize +minimize-dark +maximize +maximize-dark +close-white +close-black +titlebutton kali-headerbar-logo kali-headerbar-logo-dark text-select-end diff --git a/src/themes/Kali/sass/gtk3/_common-tweaks.scss b/src/themes/Kali/sass/gtk3/_common-tweaks.scss index 1c61e358..8f415921 100644 --- a/src/themes/Kali/sass/gtk3/_common-tweaks.scss +++ b/src/themes/Kali/sass/gtk3/_common-tweaks.scss @@ -219,7 +219,10 @@ headerbar { button.titlebutton:not(.appmenu) { $_titlebutton_bg: lighten($bg_color, 10%); color: transparent; - background: $_titlebutton_bg; + background-image: -gtk-scaled(url('assets/titlebutton.png'), url('assets/titlebutton@2.png')); + background-color: $_titlebutton_bg; + background-repeat: no-repeat; + background-position: center; margin: 0; margin-left: 5px; padding: 0; @@ -235,20 +238,34 @@ headerbar { @at-root %titlebutton_hover, &:hover { - color: $fg_color; - background: $_titlebutton_bg; + background-color: $_titlebutton_bg; border-color: transparent; box-shadow: 0 0 0 1px $borders_color; + + &.minimize { + background-image: -gtk-scaled(url('assets/minimize#{$asset_suffix}.png'), url('assets/minimize#{$asset_suffix}@2.png')); + } + &.maximize { + background-image: -gtk-scaled(url('assets/maximize#{$asset_suffix}.png'), url('assets/maximize#{$asset_suffix}@2.png')); + } } &.close { - color: if($variant=='light', white, black); - background: $selected_bg_color; + background-color: $selected_bg_color; + @if $variant == 'light' { + background-image: -gtk-scaled(url('assets/close-white.png'), url('assets/close-white@2.png')); + } @else { + background-image: -gtk-scaled(url('assets/close-black.png'), url('assets/close-black@2.png')); + } border-color: transparent; &:hover { - color: if($variant=='light', black, white); - background: mix(white, $selected_bg_color, 10%); + background-color: mix(white, $selected_bg_color, 10%); + @if $variant == 'light' { + background-image: -gtk-scaled(url('assets/close-black.png'), url('assets/close-black@2.png')); + } @else { + background-image: -gtk-scaled(url('assets/close-white.png'), url('assets/close-white@2.png')); + } } @if lightness($selected_bg_color) > 60% @@ -270,11 +287,12 @@ headerbar { &:backdrop, &:backdrop:hover { - color: transparent; - background: transparent; - box-shadow: none; - border-color: $backdrop_borders_color; - background: $shadow_color; + &.maximize, &.minimize, &.close { + box-shadow: none; + border-color: $backdrop_borders_color; + background-image: -gtk-scaled(url('assets/titlebutton.png'), url('assets/titlebutton@2.png')); + background-color: $shadow_color; + } } }