From 424373bd7b4539d3c99f642947453e86ab56930b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Mon, 20 Apr 2020 19:27:17 +0200 Subject: [PATCH] GTK3: theme changes for gtk 3.24.17 --- .../gtk-3.0/applications/nautilus/Adwaita.css | 40 +- share/themes/Kali-Dark/gtk-3.0/gtk.css | 402 +++++++++--------- .../gtk-3.0/applications/nautilus/Adwaita.css | 40 +- share/themes/Kali-Light/gtk-3.0/gtk-dark.css | 402 +++++++++--------- share/themes/Kali-Light/gtk-3.0/gtk.css | 398 +++++++++-------- src/.gitignore | 1 - src/themes/Kali/sass/.gitignore | 1 + src/themes/Kali/sass/gtk-sass/_colors.scss | 3 +- .../gtk-sass/applications/gedit/Adwaita.css | 61 +++ .../applications/nautilus/Adwaita.css | 40 +- .../Kali/sass/gtk-sass/upstream/_colors.scss | 3 +- .../Kali/sass/gtk-sass/upstream/_common.scss | 55 ++- .../Kali/sass/gtk-sass/upstream/sync.sh | 9 +- 13 files changed, 755 insertions(+), 700 deletions(-) delete mode 100644 src/.gitignore create mode 100644 src/themes/Kali/sass/.gitignore create mode 100644 src/themes/Kali/sass/gtk-sass/applications/gedit/Adwaita.css diff --git a/share/themes/Kali-Dark/gtk-3.0/applications/nautilus/Adwaita.css b/share/themes/Kali-Dark/gtk-3.0/applications/nautilus/Adwaita.css index 66665097..546d3e98 100644 --- a/share/themes/Kali-Dark/gtk-3.0/applications/nautilus/Adwaita.css +++ b/share/themes/Kali-Dark/gtk-3.0/applications/nautilus/Adwaita.css @@ -45,33 +45,29 @@ /* Path bar */ -.nautilus-path-bar button { /* undecorate the buttons */ +.path-bar-box { + border-radius: 5px; + border: 1px @borders solid; + background-color: @theme_bg_color; + padding-right: 6px; +} + +.nautilus-path-bar button { margin: 0px; } +.nautilus-path-bar button:first-child { + border-width: 0px 1px 0px 0px; + border-radius: 3.5px 0px 0px 3.5px; +} + +.nautilus-path-bar button:not(:first-child) { + border-width: 0px 1px 0px 1px; + border-radius: 0px 0px 0px 0px; +} + .nautilus-path-bar button:not(:checked) image { opacity: 0.8; } /* dim the icon when not checked */ -.path-bar-box { - transition: border 200ms; - transition: background-color 200ms; - border-radius: 5px; -} - -.path-bar-box.width-maximized { - border: 1px @borders solid; - background-color: @theme_bg_color; -} - -.path-bar-box.width-maximized button:first-child { - border-radius: 3.5px 0px 0px 3.5px; - border-width: 0px 1px 0px 0px; -} - -.path-bar-box.width-maximized button:not(:first-child) { - border-width: 0px 1px 0px 1px; - border-radius: 0px 0px 0px 0px; -} - /* Make the tags fit into the box */ entry.search > * { margin: 5px; diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css index d0914e0b..e57a0462 100644 --- a/share/themes/Kali-Dark/gtk-3.0/gtk.css +++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css @@ -1139,7 +1139,7 @@ button.circular { button.circular label { padding: 0; } - button.circular:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { + button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #0d0e11; @@ -1151,7 +1151,7 @@ button.circular { background-image: linear-gradient(to top, #20232b 2px, #23252e), linear-gradient(to top, black 25%, #0d0e11 50%); border-color: transparent; } - button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { + button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #0d0e11; @@ -1423,196 +1423,188 @@ button:visited { /***************** * GtkSpinButton * *****************/ -spinbutton:not(.vertical) { - padding: 0; } - .osd spinbutton:not(.vertical) entry, spinbutton:not(.vertical) entry { - min-width: 28px; - margin: 0; - background: none; - background-color: transparent; - border: none; - border-radius: 0; - box-shadow: none; } - spinbutton:not(.vertical) entry:backdrop:disabled { - background-color: transparent; } - spinbutton:not(.vertical) button { - min-height: 16px; - margin: 0; - padding-bottom: 0; - padding-top: 0; - color: #dadada; - background-image: none; - border-style: none none none solid; - border-color: rgba(13, 14, 17, 0.3); - border-radius: 0; - box-shadow: none; } - spinbutton:not(.vertical) button:dir(rtl) { - border-style: none solid none none; } - spinbutton:not(.vertical) button:hover { - color: #eeeeec; - background-color: rgba(238, 238, 236, 0.05); } - spinbutton:not(.vertical) button:disabled { - color: rgba(136, 138, 141, 0.3); - background-color: transparent; } - spinbutton:not(.vertical) button:active { - background-color: rgba(0, 0, 0, 0.1); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } - spinbutton:not(.vertical) button:backdrop { - color: #7f8184; +spinbutton { + font-feature-settings: "tnum"; } + spinbutton:not(.vertical) { + padding: 0; } + .osd spinbutton:not(.vertical) entry, spinbutton:not(.vertical) entry { + min-width: 28px; + margin: 0; + background: none; background-color: transparent; - border-color: rgba(17, 18, 23, 0.3); - transition: 200ms ease-out; } - spinbutton:not(.vertical) button:backdrop:disabled { - color: rgba(67, 73, 90, 0.3); + border: none; + border-radius: 0; + box-shadow: none; } + spinbutton:not(.vertical) entry:backdrop:disabled { + background-color: transparent; } + spinbutton:not(.vertical) button { + min-height: 16px; + margin: 0; + padding-bottom: 0; + padding-top: 0; + color: #dadada; + background-image: none; + border-style: none none none solid; + border-color: rgba(13, 14, 17, 0.3); + border-radius: 0; + box-shadow: none; } + spinbutton:not(.vertical) button:dir(rtl) { + border-style: none solid none none; } + spinbutton:not(.vertical) button:hover { + color: #eeeeec; + background-color: rgba(238, 238, 236, 0.05); } + spinbutton:not(.vertical) button:disabled { + color: rgba(136, 138, 141, 0.3); + background-color: transparent; } + spinbutton:not(.vertical) button:active { + background-color: rgba(0, 0, 0, 0.1); + box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } + spinbutton:not(.vertical) button:backdrop { + color: #7f8184; + background-color: transparent; + border-color: rgba(17, 18, 23, 0.3); + transition: 200ms ease-out; } + spinbutton:not(.vertical) button:backdrop:disabled { + color: rgba(67, 73, 90, 0.3); + background-color: transparent; + background-image: none; + border-style: none none none solid; } + spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { + border-style: none solid none none; } + spinbutton:not(.vertical) button:dir(ltr):last-child { + border-radius: 0 5px 5px 0; } + spinbutton:not(.vertical) button:dir(rtl):first-child { + border-radius: 5px 0 0 5px; } + .osd spinbutton:not(.vertical) button { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + color: white; + border-style: none none none solid; + border-color: rgba(0, 0, 0, 0.7); + border-radius: 0; + box-shadow: none; + -gtk-icon-shadow: 0 1px black; } + .osd spinbutton:not(.vertical) button:dir(rtl) { + border-style: none solid none none; } + .osd spinbutton:not(.vertical) button:hover { + border-color: transparent; background-color: transparent; background-image: none; - border-style: none none none solid; } - spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { - border-style: none solid none none; } - spinbutton:not(.vertical) button:dir(ltr):last-child { + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + color: white; + border-color: rgba(0, 0, 0, 0.5); + background-color: rgba(255, 255, 255, 0.1); + -gtk-icon-shadow: 0 1px black; + box-shadow: none; } + .osd spinbutton:not(.vertical) button:backdrop { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + color: white; + border-color: rgba(0, 0, 0, 0.5); + -gtk-icon-shadow: none; + box-shadow: none; } + .osd spinbutton:not(.vertical) button:disabled { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + color: #88898b; + border-color: rgba(0, 0, 0, 0.5); + -gtk-icon-shadow: none; + box-shadow: none; } + .osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 5px 5px 0; } - spinbutton:not(.vertical) button:dir(rtl):first-child { + .osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 5px 0 0 5px; } - -.osd spinbutton:not(.vertical) button { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: white; - border-style: none none none solid; - border-color: rgba(0, 0, 0, 0.7); - border-radius: 0; - box-shadow: none; - -gtk-icon-shadow: 0 1px black; } - .osd spinbutton:not(.vertical) button:dir(rtl) { - border-style: none solid none none; } - .osd spinbutton:not(.vertical) button:hover { + spinbutton.vertical:disabled { + color: #888a8d; } + spinbutton.vertical:backdrop:disabled { + color: #43495a; } + spinbutton.vertical:drop(active) { border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: white; - border-color: rgba(0, 0, 0, 0.5); - background-color: rgba(255, 255, 255, 0.1); - -gtk-icon-shadow: 0 1px black; box-shadow: none; } - .osd spinbutton:not(.vertical) button:backdrop { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: white; - border-color: rgba(0, 0, 0, 0.5); - -gtk-icon-shadow: none; - box-shadow: none; } - .osd spinbutton:not(.vertical) button:disabled { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: #88898b; - border-color: rgba(0, 0, 0, 0.5); - -gtk-icon-shadow: none; - box-shadow: none; } - .osd spinbutton:not(.vertical) button:dir(ltr):last-child { - border-radius: 0 5px 5px 0; } - .osd spinbutton:not(.vertical) button:dir(rtl):first-child { - border-radius: 5px 0 0 5px; } - -spinbutton.vertical:disabled { - color: #888a8d; } - -spinbutton.vertical:backdrop:disabled { - color: #43495a; } - -spinbutton.vertical:drop(active) { - border-color: transparent; - box-shadow: none; } - -spinbutton.vertical entry { - min-height: 32px; - min-width: 32px; - padding: 0; - border-radius: 0; } - -spinbutton.vertical button { - min-height: 32px; - min-width: 32px; - padding: 0; } - -spinbutton.vertical button.up { - border-radius: 5px 5px 0 0; - border-style: solid solid none solid; } - -spinbutton.vertical button.down { - border-radius: 0 0 5px 5px; - border-style: none solid solid solid; } - -.osd spinbutton.vertical button:first-child { - color: white; - border-color: black; - background-color: transparent; - background-image: image(#111217); - background-clip: padding-box; - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); - text-shadow: 0 1px black; - -gtk-icon-shadow: 0 1px black; - outline-color: rgba(255, 255, 255, 0.3); } - .osd spinbutton.vertical button:first-child:hover { - color: white; - border-color: black; - background-color: transparent; - background-image: image(#2b2f3a); - background-clip: padding-box; - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); - text-shadow: 0 1px black; - -gtk-icon-shadow: 0 1px black; - outline-color: rgba(255, 255, 255, 0.3); } - .osd spinbutton.vertical button:first-child:active { - color: white; - border-color: black; - background-color: transparent; - background-image: image(black); - background-clip: padding-box; - box-shadow: none; - text-shadow: none; - -gtk-icon-shadow: none; - outline-color: rgba(255, 255, 255, 0.3); } - .osd spinbutton.vertical button:first-child:disabled { - color: #88898b; - border-color: black; - background-color: transparent; - background-image: image(rgba(41, 42, 46, 0.5)); - background-clip: padding-box; - box-shadow: none; - text-shadow: none; - -gtk-icon-shadow: none; } - .osd spinbutton.vertical button:first-child:backdrop { + spinbutton.vertical entry { + min-height: 32px; + min-width: 32px; + padding: 0; + border-radius: 0; } + spinbutton.vertical button { + min-height: 32px; + min-width: 32px; + padding: 0; } + spinbutton.vertical button.up { + border-radius: 5px 5px 0 0; + border-style: solid solid none solid; } + spinbutton.vertical button.down { + border-radius: 0 0 5px 5px; + border-style: none solid solid solid; } + .osd spinbutton.vertical button:first-child { color: white; border-color: black; background-color: transparent; background-image: image(#111217); background-clip: padding-box; - box-shadow: none; - text-shadow: none; - -gtk-icon-shadow: none; } - -treeview spinbutton:not(.vertical) { - min-height: 0; - border-style: none; - border-radius: 0; } - treeview spinbutton:not(.vertical) entry { + box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + text-shadow: 0 1px black; + -gtk-icon-shadow: 0 1px black; + outline-color: rgba(255, 255, 255, 0.3); } + .osd spinbutton.vertical button:first-child:hover { + color: white; + border-color: black; + background-color: transparent; + background-image: image(#2b2f3a); + background-clip: padding-box; + box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + text-shadow: 0 1px black; + -gtk-icon-shadow: 0 1px black; + outline-color: rgba(255, 255, 255, 0.3); } + .osd spinbutton.vertical button:first-child:active { + color: white; + border-color: black; + background-color: transparent; + background-image: image(black); + background-clip: padding-box; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; + outline-color: rgba(255, 255, 255, 0.3); } + .osd spinbutton.vertical button:first-child:disabled { + color: #88898b; + border-color: black; + background-color: transparent; + background-image: image(rgba(41, 42, 46, 0.5)); + background-clip: padding-box; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; } + .osd spinbutton.vertical button:first-child:backdrop { + color: white; + border-color: black; + background-color: transparent; + background-image: image(#111217); + background-clip: padding-box; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; } + treeview spinbutton:not(.vertical) { min-height: 0; - padding: 1px 2px; } + border-style: none; + border-radius: 0; } + treeview spinbutton:not(.vertical) entry { + min-height: 0; + padding: 1px 2px; } /************** * ComboBoxes * @@ -2695,7 +2687,7 @@ switch { switch:checked { color: #ffffff; border-color: #00348d; - background-color: #2777ff; + background-color: #5a97ff; text-shadow: 0 1px rgba(0, 52, 141, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); } switch:disabled { color: #888a8d; @@ -2710,7 +2702,7 @@ switch { transition: 200ms ease-out; } switch:backdrop:checked { border-color: #00348d; - background-color: #2777ff; } + background-color: #5a97ff; } switch:backdrop:disabled { color: #43495a; border-color: #111217; @@ -2738,7 +2730,7 @@ switch { border-color: #040405; box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), 0 1px 2px rgba(0, 0, 0, 0.27); background-image: linear-gradient(to bottom, #303340 20%, #272a34 90%); } - switch:checked slider { + switch:checked > slider { border: 1px solid #00348d; } switch:disabled slider { color: #888a8d; @@ -2755,7 +2747,7 @@ switch { text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - switch:backdrop:checked slider { + switch:backdrop:checked > slider { border-color: #00348d; } switch:backdrop:disabled slider { color: #43495a; @@ -2774,7 +2766,7 @@ switch { min-width: 32px; min-height: 32px; color: transparent; - background-color: rgba(39, 119, 255, 0.95); + background-color: #5a97ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2789,7 +2781,7 @@ switch { min-width: 32px; min-height: 32px; color: transparent; - background-color: rgba(39, 119, 255, 0.95); + background-color: #5a97ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2804,7 +2796,7 @@ switch { min-width: 32px; min-height: 32px; color: transparent; - background-color: rgba(39, 119, 255, 0.95); + background-color: #5a97ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2819,7 +2811,7 @@ switch { min-width: 32px; min-height: 32px; color: transparent; - background-color: rgba(147, 147, 147, 0.95); + background-color: #adadad; border-radius: 5px; background-image: none; transition: 200ms; @@ -2834,7 +2826,7 @@ switch { min-width: 32px; min-height: 32px; color: white; - background-color: rgba(39, 119, 255, 0.95); + background-color: #5a97ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2849,7 +2841,7 @@ switch { min-width: 32px; min-height: 32px; color: white; - background-color: rgba(39, 119, 255, 0.95); + background-color: #5a97ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2864,7 +2856,7 @@ switch { min-width: 32px; min-height: 32px; color: white; - background-color: rgba(39, 119, 255, 0.95); + background-color: #5a97ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2879,7 +2871,7 @@ switch { min-width: 32px; min-height: 32px; color: rgba(255, 255, 255, 0.8); - background-color: rgba(147, 147, 147, 0.95); + background-color: #adadad; border-radius: 5px; background-image: none; transition: 200ms; @@ -2941,13 +2933,13 @@ radio { check:checked, radio:checked { background-clip: border-box; - background-image: linear-gradient(to bottom, #4187ff 20%, #2777ff 90%); - border-color: #2777ff; + background-image: linear-gradient(to bottom, #74a7ff 20%, #5a97ff 90%); + border-color: #5a97ff; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #ffffff; } check:checked:hover, radio:checked:hover { - background-image: linear-gradient(to bottom, #5594ff 10%, #3b84ff 90%); } + background-image: linear-gradient(to bottom, #88b4ff 10%, #6ea4ff 90%); } check:checked:active, radio:checked:active { box-shadow: inset 0 1px 1px 0px black; } @@ -2957,7 +2949,7 @@ radio { color: rgba(255, 255, 255, 0.7); } check:checked:backdrop, radio:checked:backdrop { - background-image: image(#2777ff); + background-image: image(#5a97ff); box-shadow: none; color: #ffffff; } check:checked:backdrop:disabled, @@ -2967,13 +2959,13 @@ radio { check:indeterminate, radio:indeterminate { background-clip: border-box; - background-image: linear-gradient(to bottom, #4187ff 20%, #2777ff 90%); - border-color: #2777ff; + background-image: linear-gradient(to bottom, #74a7ff 20%, #5a97ff 90%); + border-color: #5a97ff; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #ffffff; } check:indeterminate:hover, radio:indeterminate:hover { - background-image: linear-gradient(to bottom, #5594ff 10%, #3b84ff 90%); } + background-image: linear-gradient(to bottom, #88b4ff 10%, #6ea4ff 90%); } check:indeterminate:active, radio:indeterminate:active { box-shadow: inset 0 1px 1px 0px black; } @@ -2983,7 +2975,7 @@ radio { color: rgba(255, 255, 255, 0.7); } check:indeterminate:backdrop, radio:indeterminate:backdrop { - background-image: image(#2777ff); + background-image: image(#5a97ff); box-shadow: none; color: #ffffff; } check:indeterminate:backdrop:disabled, @@ -3047,6 +3039,7 @@ radio { min-height: 14px; min-width: 14px; background-image: none; + background-color: transparent; box-shadow: none; -gtk-icon-shadow: none; color: inherit; @@ -3281,7 +3274,8 @@ scale { background-color: #111217; } scale marks, scale value { - color: alpha(currentColor,0.55); } + color: alpha(currentColor,0.55); + font-feature-settings: "tnum"; } scale.horizontal marks.top { margin-bottom: 6px; margin-top: -12px; } @@ -3742,7 +3736,8 @@ scale { *****************/ progressbar { font-size: smaller; - color: rgba(238, 238, 236, 0.4); } + color: rgba(238, 238, 236, 0.4); + font-feature-settings: "tnum"; } progressbar.horizontal trough, progressbar.horizontal progress { min-height: 2px; } @@ -4546,6 +4541,9 @@ decoration { box-shadow: inset 0 0 0 3px #1c1e25, inset 0 1px rgba(238, 238, 236, 0.07); } .solid-csd decoration:backdrop { box-shadow: inset 0 0 0 3px #23252e, inset 0 1px rgba(238, 238, 236, 0.07); } + window.csd decoration { + background: black; + /* transparent makes gtk3 leak light on the corners #2537 */ } button.titlebutton { text-shadow: 0 -1px rgba(0, 0, 0, 0.873255); @@ -4837,7 +4835,7 @@ radio:indeterminate, menu menuitem radio:checked, menu menuitem radio:indetermin check:checked:backdrop, check:indeterminate:backdrop, menu menuitem check:checked:backdrop, menu menuitem check:indeterminate:backdrop, radio:checked:backdrop, radio:indeterminate:backdrop, menu menuitem radio:checked:backdrop, menu menuitem radio:indeterminate:backdrop { - background-image: image(#2777ff); } + background-image: image(#5a97ff); } check:checked:disabled, check:indeterminate:disabled, menu menuitem check:checked:disabled, menu menuitem check:indeterminate:disabled, radio:checked:disabled, diff --git a/share/themes/Kali-Light/gtk-3.0/applications/nautilus/Adwaita.css b/share/themes/Kali-Light/gtk-3.0/applications/nautilus/Adwaita.css index 66665097..546d3e98 100644 --- a/share/themes/Kali-Light/gtk-3.0/applications/nautilus/Adwaita.css +++ b/share/themes/Kali-Light/gtk-3.0/applications/nautilus/Adwaita.css @@ -45,33 +45,29 @@ /* Path bar */ -.nautilus-path-bar button { /* undecorate the buttons */ +.path-bar-box { + border-radius: 5px; + border: 1px @borders solid; + background-color: @theme_bg_color; + padding-right: 6px; +} + +.nautilus-path-bar button { margin: 0px; } +.nautilus-path-bar button:first-child { + border-width: 0px 1px 0px 0px; + border-radius: 3.5px 0px 0px 3.5px; +} + +.nautilus-path-bar button:not(:first-child) { + border-width: 0px 1px 0px 1px; + border-radius: 0px 0px 0px 0px; +} + .nautilus-path-bar button:not(:checked) image { opacity: 0.8; } /* dim the icon when not checked */ -.path-bar-box { - transition: border 200ms; - transition: background-color 200ms; - border-radius: 5px; -} - -.path-bar-box.width-maximized { - border: 1px @borders solid; - background-color: @theme_bg_color; -} - -.path-bar-box.width-maximized button:first-child { - border-radius: 3.5px 0px 0px 3.5px; - border-width: 0px 1px 0px 0px; -} - -.path-bar-box.width-maximized button:not(:first-child) { - border-width: 0px 1px 0px 1px; - border-radius: 0px 0px 0px 0px; -} - /* Make the tags fit into the box */ entry.search > * { margin: 5px; 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 d0914e0b..e57a0462 100644 --- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css +++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css @@ -1139,7 +1139,7 @@ button.circular { button.circular label { padding: 0; } - button.circular:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { + button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #0d0e11; @@ -1151,7 +1151,7 @@ button.circular { background-image: linear-gradient(to top, #20232b 2px, #23252e), linear-gradient(to top, black 25%, #0d0e11 50%); border-color: transparent; } - button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { + button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #0d0e11; @@ -1423,196 +1423,188 @@ button:visited { /***************** * GtkSpinButton * *****************/ -spinbutton:not(.vertical) { - padding: 0; } - .osd spinbutton:not(.vertical) entry, spinbutton:not(.vertical) entry { - min-width: 28px; - margin: 0; - background: none; - background-color: transparent; - border: none; - border-radius: 0; - box-shadow: none; } - spinbutton:not(.vertical) entry:backdrop:disabled { - background-color: transparent; } - spinbutton:not(.vertical) button { - min-height: 16px; - margin: 0; - padding-bottom: 0; - padding-top: 0; - color: #dadada; - background-image: none; - border-style: none none none solid; - border-color: rgba(13, 14, 17, 0.3); - border-radius: 0; - box-shadow: none; } - spinbutton:not(.vertical) button:dir(rtl) { - border-style: none solid none none; } - spinbutton:not(.vertical) button:hover { - color: #eeeeec; - background-color: rgba(238, 238, 236, 0.05); } - spinbutton:not(.vertical) button:disabled { - color: rgba(136, 138, 141, 0.3); - background-color: transparent; } - spinbutton:not(.vertical) button:active { - background-color: rgba(0, 0, 0, 0.1); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } - spinbutton:not(.vertical) button:backdrop { - color: #7f8184; +spinbutton { + font-feature-settings: "tnum"; } + spinbutton:not(.vertical) { + padding: 0; } + .osd spinbutton:not(.vertical) entry, spinbutton:not(.vertical) entry { + min-width: 28px; + margin: 0; + background: none; background-color: transparent; - border-color: rgba(17, 18, 23, 0.3); - transition: 200ms ease-out; } - spinbutton:not(.vertical) button:backdrop:disabled { - color: rgba(67, 73, 90, 0.3); + border: none; + border-radius: 0; + box-shadow: none; } + spinbutton:not(.vertical) entry:backdrop:disabled { + background-color: transparent; } + spinbutton:not(.vertical) button { + min-height: 16px; + margin: 0; + padding-bottom: 0; + padding-top: 0; + color: #dadada; + background-image: none; + border-style: none none none solid; + border-color: rgba(13, 14, 17, 0.3); + border-radius: 0; + box-shadow: none; } + spinbutton:not(.vertical) button:dir(rtl) { + border-style: none solid none none; } + spinbutton:not(.vertical) button:hover { + color: #eeeeec; + background-color: rgba(238, 238, 236, 0.05); } + spinbutton:not(.vertical) button:disabled { + color: rgba(136, 138, 141, 0.3); + background-color: transparent; } + spinbutton:not(.vertical) button:active { + background-color: rgba(0, 0, 0, 0.1); + box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } + spinbutton:not(.vertical) button:backdrop { + color: #7f8184; + background-color: transparent; + border-color: rgba(17, 18, 23, 0.3); + transition: 200ms ease-out; } + spinbutton:not(.vertical) button:backdrop:disabled { + color: rgba(67, 73, 90, 0.3); + background-color: transparent; + background-image: none; + border-style: none none none solid; } + spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { + border-style: none solid none none; } + spinbutton:not(.vertical) button:dir(ltr):last-child { + border-radius: 0 5px 5px 0; } + spinbutton:not(.vertical) button:dir(rtl):first-child { + border-radius: 5px 0 0 5px; } + .osd spinbutton:not(.vertical) button { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + color: white; + border-style: none none none solid; + border-color: rgba(0, 0, 0, 0.7); + border-radius: 0; + box-shadow: none; + -gtk-icon-shadow: 0 1px black; } + .osd spinbutton:not(.vertical) button:dir(rtl) { + border-style: none solid none none; } + .osd spinbutton:not(.vertical) button:hover { + border-color: transparent; background-color: transparent; background-image: none; - border-style: none none none solid; } - spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { - border-style: none solid none none; } - spinbutton:not(.vertical) button:dir(ltr):last-child { + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + color: white; + border-color: rgba(0, 0, 0, 0.5); + background-color: rgba(255, 255, 255, 0.1); + -gtk-icon-shadow: 0 1px black; + box-shadow: none; } + .osd spinbutton:not(.vertical) button:backdrop { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + color: white; + border-color: rgba(0, 0, 0, 0.5); + -gtk-icon-shadow: none; + box-shadow: none; } + .osd spinbutton:not(.vertical) button:disabled { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + color: #88898b; + border-color: rgba(0, 0, 0, 0.5); + -gtk-icon-shadow: none; + box-shadow: none; } + .osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 5px 5px 0; } - spinbutton:not(.vertical) button:dir(rtl):first-child { + .osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 5px 0 0 5px; } - -.osd spinbutton:not(.vertical) button { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: white; - border-style: none none none solid; - border-color: rgba(0, 0, 0, 0.7); - border-radius: 0; - box-shadow: none; - -gtk-icon-shadow: 0 1px black; } - .osd spinbutton:not(.vertical) button:dir(rtl) { - border-style: none solid none none; } - .osd spinbutton:not(.vertical) button:hover { + spinbutton.vertical:disabled { + color: #888a8d; } + spinbutton.vertical:backdrop:disabled { + color: #43495a; } + spinbutton.vertical:drop(active) { border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: white; - border-color: rgba(0, 0, 0, 0.5); - background-color: rgba(255, 255, 255, 0.1); - -gtk-icon-shadow: 0 1px black; box-shadow: none; } - .osd spinbutton:not(.vertical) button:backdrop { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: white; - border-color: rgba(0, 0, 0, 0.5); - -gtk-icon-shadow: none; - box-shadow: none; } - .osd spinbutton:not(.vertical) button:disabled { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: #88898b; - border-color: rgba(0, 0, 0, 0.5); - -gtk-icon-shadow: none; - box-shadow: none; } - .osd spinbutton:not(.vertical) button:dir(ltr):last-child { - border-radius: 0 5px 5px 0; } - .osd spinbutton:not(.vertical) button:dir(rtl):first-child { - border-radius: 5px 0 0 5px; } - -spinbutton.vertical:disabled { - color: #888a8d; } - -spinbutton.vertical:backdrop:disabled { - color: #43495a; } - -spinbutton.vertical:drop(active) { - border-color: transparent; - box-shadow: none; } - -spinbutton.vertical entry { - min-height: 32px; - min-width: 32px; - padding: 0; - border-radius: 0; } - -spinbutton.vertical button { - min-height: 32px; - min-width: 32px; - padding: 0; } - -spinbutton.vertical button.up { - border-radius: 5px 5px 0 0; - border-style: solid solid none solid; } - -spinbutton.vertical button.down { - border-radius: 0 0 5px 5px; - border-style: none solid solid solid; } - -.osd spinbutton.vertical button:first-child { - color: white; - border-color: black; - background-color: transparent; - background-image: image(#111217); - background-clip: padding-box; - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); - text-shadow: 0 1px black; - -gtk-icon-shadow: 0 1px black; - outline-color: rgba(255, 255, 255, 0.3); } - .osd spinbutton.vertical button:first-child:hover { - color: white; - border-color: black; - background-color: transparent; - background-image: image(#2b2f3a); - background-clip: padding-box; - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); - text-shadow: 0 1px black; - -gtk-icon-shadow: 0 1px black; - outline-color: rgba(255, 255, 255, 0.3); } - .osd spinbutton.vertical button:first-child:active { - color: white; - border-color: black; - background-color: transparent; - background-image: image(black); - background-clip: padding-box; - box-shadow: none; - text-shadow: none; - -gtk-icon-shadow: none; - outline-color: rgba(255, 255, 255, 0.3); } - .osd spinbutton.vertical button:first-child:disabled { - color: #88898b; - border-color: black; - background-color: transparent; - background-image: image(rgba(41, 42, 46, 0.5)); - background-clip: padding-box; - box-shadow: none; - text-shadow: none; - -gtk-icon-shadow: none; } - .osd spinbutton.vertical button:first-child:backdrop { + spinbutton.vertical entry { + min-height: 32px; + min-width: 32px; + padding: 0; + border-radius: 0; } + spinbutton.vertical button { + min-height: 32px; + min-width: 32px; + padding: 0; } + spinbutton.vertical button.up { + border-radius: 5px 5px 0 0; + border-style: solid solid none solid; } + spinbutton.vertical button.down { + border-radius: 0 0 5px 5px; + border-style: none solid solid solid; } + .osd spinbutton.vertical button:first-child { color: white; border-color: black; background-color: transparent; background-image: image(#111217); background-clip: padding-box; - box-shadow: none; - text-shadow: none; - -gtk-icon-shadow: none; } - -treeview spinbutton:not(.vertical) { - min-height: 0; - border-style: none; - border-radius: 0; } - treeview spinbutton:not(.vertical) entry { + box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + text-shadow: 0 1px black; + -gtk-icon-shadow: 0 1px black; + outline-color: rgba(255, 255, 255, 0.3); } + .osd spinbutton.vertical button:first-child:hover { + color: white; + border-color: black; + background-color: transparent; + background-image: image(#2b2f3a); + background-clip: padding-box; + box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + text-shadow: 0 1px black; + -gtk-icon-shadow: 0 1px black; + outline-color: rgba(255, 255, 255, 0.3); } + .osd spinbutton.vertical button:first-child:active { + color: white; + border-color: black; + background-color: transparent; + background-image: image(black); + background-clip: padding-box; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; + outline-color: rgba(255, 255, 255, 0.3); } + .osd spinbutton.vertical button:first-child:disabled { + color: #88898b; + border-color: black; + background-color: transparent; + background-image: image(rgba(41, 42, 46, 0.5)); + background-clip: padding-box; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; } + .osd spinbutton.vertical button:first-child:backdrop { + color: white; + border-color: black; + background-color: transparent; + background-image: image(#111217); + background-clip: padding-box; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; } + treeview spinbutton:not(.vertical) { min-height: 0; - padding: 1px 2px; } + border-style: none; + border-radius: 0; } + treeview spinbutton:not(.vertical) entry { + min-height: 0; + padding: 1px 2px; } /************** * ComboBoxes * @@ -2695,7 +2687,7 @@ switch { switch:checked { color: #ffffff; border-color: #00348d; - background-color: #2777ff; + background-color: #5a97ff; text-shadow: 0 1px rgba(0, 52, 141, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); } switch:disabled { color: #888a8d; @@ -2710,7 +2702,7 @@ switch { transition: 200ms ease-out; } switch:backdrop:checked { border-color: #00348d; - background-color: #2777ff; } + background-color: #5a97ff; } switch:backdrop:disabled { color: #43495a; border-color: #111217; @@ -2738,7 +2730,7 @@ switch { border-color: #040405; box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), 0 1px 2px rgba(0, 0, 0, 0.27); background-image: linear-gradient(to bottom, #303340 20%, #272a34 90%); } - switch:checked slider { + switch:checked > slider { border: 1px solid #00348d; } switch:disabled slider { color: #888a8d; @@ -2755,7 +2747,7 @@ switch { text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - switch:backdrop:checked slider { + switch:backdrop:checked > slider { border-color: #00348d; } switch:backdrop:disabled slider { color: #43495a; @@ -2774,7 +2766,7 @@ switch { min-width: 32px; min-height: 32px; color: transparent; - background-color: rgba(39, 119, 255, 0.95); + background-color: #5a97ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2789,7 +2781,7 @@ switch { min-width: 32px; min-height: 32px; color: transparent; - background-color: rgba(39, 119, 255, 0.95); + background-color: #5a97ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2804,7 +2796,7 @@ switch { min-width: 32px; min-height: 32px; color: transparent; - background-color: rgba(39, 119, 255, 0.95); + background-color: #5a97ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2819,7 +2811,7 @@ switch { min-width: 32px; min-height: 32px; color: transparent; - background-color: rgba(147, 147, 147, 0.95); + background-color: #adadad; border-radius: 5px; background-image: none; transition: 200ms; @@ -2834,7 +2826,7 @@ switch { min-width: 32px; min-height: 32px; color: white; - background-color: rgba(39, 119, 255, 0.95); + background-color: #5a97ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2849,7 +2841,7 @@ switch { min-width: 32px; min-height: 32px; color: white; - background-color: rgba(39, 119, 255, 0.95); + background-color: #5a97ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2864,7 +2856,7 @@ switch { min-width: 32px; min-height: 32px; color: white; - background-color: rgba(39, 119, 255, 0.95); + background-color: #5a97ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2879,7 +2871,7 @@ switch { min-width: 32px; min-height: 32px; color: rgba(255, 255, 255, 0.8); - background-color: rgba(147, 147, 147, 0.95); + background-color: #adadad; border-radius: 5px; background-image: none; transition: 200ms; @@ -2941,13 +2933,13 @@ radio { check:checked, radio:checked { background-clip: border-box; - background-image: linear-gradient(to bottom, #4187ff 20%, #2777ff 90%); - border-color: #2777ff; + background-image: linear-gradient(to bottom, #74a7ff 20%, #5a97ff 90%); + border-color: #5a97ff; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #ffffff; } check:checked:hover, radio:checked:hover { - background-image: linear-gradient(to bottom, #5594ff 10%, #3b84ff 90%); } + background-image: linear-gradient(to bottom, #88b4ff 10%, #6ea4ff 90%); } check:checked:active, radio:checked:active { box-shadow: inset 0 1px 1px 0px black; } @@ -2957,7 +2949,7 @@ radio { color: rgba(255, 255, 255, 0.7); } check:checked:backdrop, radio:checked:backdrop { - background-image: image(#2777ff); + background-image: image(#5a97ff); box-shadow: none; color: #ffffff; } check:checked:backdrop:disabled, @@ -2967,13 +2959,13 @@ radio { check:indeterminate, radio:indeterminate { background-clip: border-box; - background-image: linear-gradient(to bottom, #4187ff 20%, #2777ff 90%); - border-color: #2777ff; + background-image: linear-gradient(to bottom, #74a7ff 20%, #5a97ff 90%); + border-color: #5a97ff; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #ffffff; } check:indeterminate:hover, radio:indeterminate:hover { - background-image: linear-gradient(to bottom, #5594ff 10%, #3b84ff 90%); } + background-image: linear-gradient(to bottom, #88b4ff 10%, #6ea4ff 90%); } check:indeterminate:active, radio:indeterminate:active { box-shadow: inset 0 1px 1px 0px black; } @@ -2983,7 +2975,7 @@ radio { color: rgba(255, 255, 255, 0.7); } check:indeterminate:backdrop, radio:indeterminate:backdrop { - background-image: image(#2777ff); + background-image: image(#5a97ff); box-shadow: none; color: #ffffff; } check:indeterminate:backdrop:disabled, @@ -3047,6 +3039,7 @@ radio { min-height: 14px; min-width: 14px; background-image: none; + background-color: transparent; box-shadow: none; -gtk-icon-shadow: none; color: inherit; @@ -3281,7 +3274,8 @@ scale { background-color: #111217; } scale marks, scale value { - color: alpha(currentColor,0.55); } + color: alpha(currentColor,0.55); + font-feature-settings: "tnum"; } scale.horizontal marks.top { margin-bottom: 6px; margin-top: -12px; } @@ -3742,7 +3736,8 @@ scale { *****************/ progressbar { font-size: smaller; - color: rgba(238, 238, 236, 0.4); } + color: rgba(238, 238, 236, 0.4); + font-feature-settings: "tnum"; } progressbar.horizontal trough, progressbar.horizontal progress { min-height: 2px; } @@ -4546,6 +4541,9 @@ decoration { box-shadow: inset 0 0 0 3px #1c1e25, inset 0 1px rgba(238, 238, 236, 0.07); } .solid-csd decoration:backdrop { box-shadow: inset 0 0 0 3px #23252e, inset 0 1px rgba(238, 238, 236, 0.07); } + window.csd decoration { + background: black; + /* transparent makes gtk3 leak light on the corners #2537 */ } button.titlebutton { text-shadow: 0 -1px rgba(0, 0, 0, 0.873255); @@ -4837,7 +4835,7 @@ radio:indeterminate, menu menuitem radio:checked, menu menuitem radio:indetermin check:checked:backdrop, check:indeterminate:backdrop, menu menuitem check:checked:backdrop, menu menuitem check:indeterminate:backdrop, radio:checked:backdrop, radio:indeterminate:backdrop, menu menuitem radio:checked:backdrop, menu menuitem radio:indeterminate:backdrop { - background-image: image(#2777ff); } + background-image: image(#5a97ff); } check:checked:disabled, check:indeterminate:disabled, menu menuitem check:checked:disabled, menu menuitem check:indeterminate:disabled, radio:checked:disabled, diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css index c424a57f..65454cf5 100644 --- a/share/themes/Kali-Light/gtk-3.0/gtk.css +++ b/share/themes/Kali-Light/gtk-3.0/gtk.css @@ -1142,7 +1142,7 @@ button.circular { button.circular label { padding: 0; } - button.circular:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { + button.circular:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); border-color: #d9d9d9; @@ -1154,7 +1154,7 @@ button.circular { background-image: linear-gradient(to top, whitesmoke 2px, #ffffff), linear-gradient(to top, #c2c2c2 25%, #d9d9d9 50%); border-color: transparent; } - button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { + button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); border-color: #d9d9d9; @@ -1432,196 +1432,188 @@ button:visited { /***************** * GtkSpinButton * *****************/ -spinbutton:not(.vertical) { - padding: 0; } - .osd spinbutton:not(.vertical) entry, spinbutton:not(.vertical) entry { - min-width: 28px; - margin: 0; - background: none; - background-color: transparent; - border: none; - border-radius: 0; - box-shadow: none; } - spinbutton:not(.vertical) entry:backdrop:disabled { - background-color: transparent; } - spinbutton:not(.vertical) button { - min-height: 16px; - margin: 0; - padding-bottom: 0; - padding-top: 0; - color: #6c707a; - background-image: none; - border-style: none none none solid; - border-color: rgba(217, 217, 217, 0.3); - border-radius: 0; - box-shadow: none; } - spinbutton:not(.vertical) button:dir(rtl) { - border-style: none solid none none; } - spinbutton:not(.vertical) button:hover { - color: #5c616c; - background-color: rgba(92, 97, 108, 0.05); } - spinbutton:not(.vertical) button:disabled { - color: rgba(174, 176, 182, 0.3); - background-color: transparent; } - spinbutton:not(.vertical) button:active { - background-color: rgba(0, 0, 0, 0.1); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } - spinbutton:not(.vertical) button:backdrop { - color: #b5b7bd; +spinbutton { + font-feature-settings: "tnum"; } + spinbutton:not(.vertical) { + padding: 0; } + .osd spinbutton:not(.vertical) entry, spinbutton:not(.vertical) entry { + min-width: 28px; + margin: 0; + background: none; background-color: transparent; - border-color: rgba(224, 224, 224, 0.3); - transition: 200ms ease-out; } - spinbutton:not(.vertical) button:backdrop:disabled { - color: rgba(217, 217, 217, 0.3); + border: none; + border-radius: 0; + box-shadow: none; } + spinbutton:not(.vertical) entry:backdrop:disabled { + background-color: transparent; } + spinbutton:not(.vertical) button { + min-height: 16px; + margin: 0; + padding-bottom: 0; + padding-top: 0; + color: #6c707a; + background-image: none; + border-style: none none none solid; + border-color: rgba(217, 217, 217, 0.3); + border-radius: 0; + box-shadow: none; } + spinbutton:not(.vertical) button:dir(rtl) { + border-style: none solid none none; } + spinbutton:not(.vertical) button:hover { + color: #5c616c; + background-color: rgba(92, 97, 108, 0.05); } + spinbutton:not(.vertical) button:disabled { + color: rgba(174, 176, 182, 0.3); + background-color: transparent; } + spinbutton:not(.vertical) button:active { + background-color: rgba(0, 0, 0, 0.1); + box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } + spinbutton:not(.vertical) button:backdrop { + color: #b5b7bd; + background-color: transparent; + border-color: rgba(224, 224, 224, 0.3); + transition: 200ms ease-out; } + spinbutton:not(.vertical) button:backdrop:disabled { + color: rgba(217, 217, 217, 0.3); + background-color: transparent; + background-image: none; + border-style: none none none solid; } + spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { + border-style: none solid none none; } + spinbutton:not(.vertical) button:dir(ltr):last-child { + border-radius: 0 5px 5px 0; } + spinbutton:not(.vertical) button:dir(rtl):first-child { + border-radius: 5px 0 0 5px; } + .osd spinbutton:not(.vertical) button { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + color: white; + border-style: none none none solid; + border-color: rgba(0, 0, 0, 0.7); + border-radius: 0; + box-shadow: none; + -gtk-icon-shadow: 0 1px black; } + .osd spinbutton:not(.vertical) button:dir(rtl) { + border-style: none solid none none; } + .osd spinbutton:not(.vertical) button:hover { + border-color: transparent; background-color: transparent; background-image: none; - border-style: none none none solid; } - spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { - border-style: none solid none none; } - spinbutton:not(.vertical) button:dir(ltr):last-child { + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + color: white; + border-color: rgba(0, 0, 0, 0.5); + background-color: rgba(255, 255, 255, 0.1); + -gtk-icon-shadow: 0 1px black; + box-shadow: none; } + .osd spinbutton:not(.vertical) button:backdrop { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + color: white; + border-color: rgba(0, 0, 0, 0.5); + -gtk-icon-shadow: none; + box-shadow: none; } + .osd spinbutton:not(.vertical) button:disabled { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + color: #93959a; + border-color: rgba(0, 0, 0, 0.5); + -gtk-icon-shadow: none; + box-shadow: none; } + .osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 5px 5px 0; } - spinbutton:not(.vertical) button:dir(rtl):first-child { + .osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 5px 0 0 5px; } - -.osd spinbutton:not(.vertical) button { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: white; - border-style: none none none solid; - border-color: rgba(0, 0, 0, 0.7); - border-radius: 0; - box-shadow: none; - -gtk-icon-shadow: 0 1px black; } - .osd spinbutton:not(.vertical) button:dir(rtl) { - border-style: none solid none none; } - .osd spinbutton:not(.vertical) button:hover { + spinbutton.vertical:disabled { + color: #aeb0b6; } + spinbutton.vertical:backdrop:disabled { + color: #d9d9d9; } + spinbutton.vertical:drop(active) { border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: white; - border-color: rgba(0, 0, 0, 0.5); - background-color: rgba(255, 255, 255, 0.1); - -gtk-icon-shadow: 0 1px black; box-shadow: none; } - .osd spinbutton:not(.vertical) button:backdrop { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: white; - border-color: rgba(0, 0, 0, 0.5); - -gtk-icon-shadow: none; - box-shadow: none; } - .osd spinbutton:not(.vertical) button:disabled { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; - color: #93959a; - border-color: rgba(0, 0, 0, 0.5); - -gtk-icon-shadow: none; - box-shadow: none; } - .osd spinbutton:not(.vertical) button:dir(ltr):last-child { - border-radius: 0 5px 5px 0; } - .osd spinbutton:not(.vertical) button:dir(rtl):first-child { - border-radius: 5px 0 0 5px; } - -spinbutton.vertical:disabled { - color: #aeb0b6; } - -spinbutton.vertical:backdrop:disabled { - color: #d9d9d9; } - -spinbutton.vertical:drop(active) { - border-color: transparent; - box-shadow: none; } - -spinbutton.vertical entry { - min-height: 32px; - min-width: 32px; - padding: 0; - border-radius: 0; } - -spinbutton.vertical button { - min-height: 32px; - min-width: 32px; - padding: 0; } - -spinbutton.vertical button.up { - border-radius: 5px 5px 0 0; - border-style: solid solid none solid; } - -spinbutton.vertical button.down { - border-radius: 0 0 5px 5px; - border-style: none solid solid solid; } - -.osd spinbutton.vertical button:first-child { - color: white; - border-color: black; - background-color: transparent; - background-image: image(#272a34); - background-clip: padding-box; - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); - text-shadow: 0 1px black; - -gtk-icon-shadow: 0 1px black; - outline-color: rgba(255, 255, 255, 0.3); } - .osd spinbutton.vertical button:first-child:hover { - color: white; - border-color: black; - background-color: transparent; - background-image: image(#414657); - background-clip: padding-box; - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); - text-shadow: 0 1px black; - -gtk-icon-shadow: 0 1px black; - outline-color: rgba(255, 255, 255, 0.3); } - .osd spinbutton.vertical button:first-child:active { - color: white; - border-color: black; - background-color: transparent; - background-image: image(black); - background-clip: padding-box; - box-shadow: none; - text-shadow: none; - -gtk-icon-shadow: none; - outline-color: rgba(255, 255, 255, 0.3); } - .osd spinbutton.vertical button:first-child:disabled { - color: #93959a; - border-color: black; - background-color: transparent; - background-image: image(rgba(61, 63, 72, 0.5)); - background-clip: padding-box; - box-shadow: none; - text-shadow: none; - -gtk-icon-shadow: none; } - .osd spinbutton.vertical button:first-child:backdrop { + spinbutton.vertical entry { + min-height: 32px; + min-width: 32px; + padding: 0; + border-radius: 0; } + spinbutton.vertical button { + min-height: 32px; + min-width: 32px; + padding: 0; } + spinbutton.vertical button.up { + border-radius: 5px 5px 0 0; + border-style: solid solid none solid; } + spinbutton.vertical button.down { + border-radius: 0 0 5px 5px; + border-style: none solid solid solid; } + .osd spinbutton.vertical button:first-child { color: white; border-color: black; background-color: transparent; background-image: image(#272a34); background-clip: padding-box; - box-shadow: none; - text-shadow: none; - -gtk-icon-shadow: none; } - -treeview spinbutton:not(.vertical) { - min-height: 0; - border-style: none; - border-radius: 0; } - treeview spinbutton:not(.vertical) entry { + box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + text-shadow: 0 1px black; + -gtk-icon-shadow: 0 1px black; + outline-color: rgba(255, 255, 255, 0.3); } + .osd spinbutton.vertical button:first-child:hover { + color: white; + border-color: black; + background-color: transparent; + background-image: image(#414657); + background-clip: padding-box; + box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); + text-shadow: 0 1px black; + -gtk-icon-shadow: 0 1px black; + outline-color: rgba(255, 255, 255, 0.3); } + .osd spinbutton.vertical button:first-child:active { + color: white; + border-color: black; + background-color: transparent; + background-image: image(black); + background-clip: padding-box; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; + outline-color: rgba(255, 255, 255, 0.3); } + .osd spinbutton.vertical button:first-child:disabled { + color: #93959a; + border-color: black; + background-color: transparent; + background-image: image(rgba(61, 63, 72, 0.5)); + background-clip: padding-box; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; } + .osd spinbutton.vertical button:first-child:backdrop { + color: white; + border-color: black; + background-color: transparent; + background-image: image(#272a34); + background-clip: padding-box; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; } + treeview spinbutton:not(.vertical) { min-height: 0; - padding: 1px 2px; } + border-style: none; + border-radius: 0; } + treeview spinbutton:not(.vertical) entry { + min-height: 0; + padding: 1px 2px; } /************** * ComboBoxes * @@ -2705,7 +2697,7 @@ switch { /* only show i / o for the accessible theme */ } switch:checked { color: #ffffff; - border-color: #0051da; + border-color: #0047c0; background-color: #2777ff; text-shadow: 0 1px rgba(0, 81, 218, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); } switch:disabled { @@ -2721,7 +2713,7 @@ switch { transition: 200ms ease-out; } switch:backdrop:checked { color: #ffffff; - border-color: #2777ff; + border-color: #0047c0; background-color: #2777ff; } switch:backdrop:disabled { color: #d9d9d9; @@ -2750,8 +2742,8 @@ switch { border-color: #c2c2c2; box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to bottom, white 10%, white 90%); } - switch:checked slider { - border: 1px solid #0051da; } + switch:checked > slider { + border: 1px solid #0047c0; } switch:disabled slider { color: #aeb0b6; border-color: #d9d9d9; @@ -2767,8 +2759,8 @@ switch { text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } - switch:backdrop:checked slider { - border-color: #2777ff; } + switch:backdrop:checked > slider { + border-color: #0047c0; } switch:backdrop:disabled slider { color: #d9d9d9; border-color: #e0e0e0; @@ -2778,11 +2770,11 @@ switch { box-shadow: inset 0 1px rgba(255, 255, 255, 0); } row:selected switch { box-shadow: none; - border-color: #0051da; } + border-color: #0047c0; } row:selected switch:backdrop { - border-color: #0051da; } - row:selected switch slider:checked, row:selected switch slider { - border-color: #0051da; } + border-color: #0047c0; } + row:selected switch > slider:checked, row:selected switch > slider { + border-color: #0047c0; } /************************* * Check and Radio items * @@ -2793,7 +2785,7 @@ switch { min-width: 32px; min-height: 32px; color: transparent; - background-color: rgba(39, 119, 255, 0.95); + background-color: #2777ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2808,7 +2800,7 @@ switch { min-width: 32px; min-height: 32px; color: transparent; - background-color: rgba(39, 119, 255, 0.95); + background-color: #2777ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2823,7 +2815,7 @@ switch { min-width: 32px; min-height: 32px; color: transparent; - background-color: rgba(39, 119, 255, 0.95); + background-color: #2777ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2838,7 +2830,7 @@ switch { min-width: 32px; min-height: 32px; color: transparent; - background-color: rgba(147, 147, 147, 0.95); + background-color: #939393; border-radius: 5px; background-image: none; transition: 200ms; @@ -2853,7 +2845,7 @@ switch { min-width: 32px; min-height: 32px; color: white; - background-color: rgba(39, 119, 255, 0.95); + background-color: #2777ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2868,7 +2860,7 @@ switch { min-width: 32px; min-height: 32px; color: white; - background-color: rgba(39, 119, 255, 0.95); + background-color: #2777ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2883,7 +2875,7 @@ switch { min-width: 32px; min-height: 32px; color: white; - background-color: rgba(39, 119, 255, 0.95); + background-color: #2777ff; border-radius: 5px; background-image: none; transition: 200ms; @@ -2898,7 +2890,7 @@ switch { min-width: 32px; min-height: 32px; color: rgba(255, 255, 255, 0.8); - background-color: rgba(147, 147, 147, 0.95); + background-color: #939393; border-radius: 5px; background-image: none; transition: 200ms; @@ -3013,7 +3005,7 @@ radio { radio:backdrop { transition: 200ms ease-out; } row:selected check, row:selected radio { - border-color: #0051da; } + border-color: #0047c0; } .osd check, .osd radio { color: white; border-color: black; @@ -3068,6 +3060,7 @@ radio { min-height: 14px; min-width: 14px; background-image: none; + background-color: transparent; box-shadow: none; -gtk-icon-shadow: none; color: inherit; @@ -3303,7 +3296,8 @@ scale { background-color: #272a34; } scale marks, scale value { - color: alpha(currentColor,0.55); } + color: alpha(currentColor,0.55); + font-feature-settings: "tnum"; } scale.horizontal marks.top { margin-bottom: 6px; margin-top: -12px; } @@ -3764,7 +3758,8 @@ scale { *****************/ progressbar { font-size: smaller; - color: rgba(92, 97, 108, 0.4); } + color: rgba(92, 97, 108, 0.4); + font-feature-settings: "tnum"; } progressbar.horizontal trough, progressbar.horizontal progress { min-height: 2px; } @@ -4568,6 +4563,9 @@ decoration { box-shadow: inset 0 0 0 3px white, inset 0 1px rgba(255, 255, 255, 0.8); } .solid-csd decoration:backdrop { box-shadow: inset 0 0 0 3px #ffffff, inset 0 1px rgba(255, 255, 255, 0.8); } + window.csd decoration { + background: black; + /* transparent makes gtk3 leak light on the corners #2537 */ } button.titlebutton { text-shadow: 0 1px rgba(255, 255, 255, 0.769231); diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 4d4c0c2d..00000000 --- a/src/.gitignore +++ /dev/null @@ -1 +0,0 @@ -**/*.css diff --git a/src/themes/Kali/sass/.gitignore b/src/themes/Kali/sass/.gitignore new file mode 100644 index 00000000..7752adb2 --- /dev/null +++ b/src/themes/Kali/sass/.gitignore @@ -0,0 +1 @@ +/*.css diff --git a/src/themes/Kali/sass/gtk-sass/_colors.scss b/src/themes/Kali/sass/gtk-sass/_colors.scss index d1e589f8..b8ff4541 100644 --- a/src/themes/Kali/sass/gtk-sass/_colors.scss +++ b/src/themes/Kali/sass/gtk-sass/_colors.scss @@ -74,5 +74,6 @@ $suggested_bg_color: $selected_bg_color; $suggested_border_color: $selected_borders_color; $progress_bg_color: $selected_bg_color; $progress_border_color: $selected_borders_color; -$checkradio_bg_color: $selected_bg_color; +$checkradio_bg_color: if($variant == 'light', $selected_bg_color, lighten($selected_bg_color,10%)); $checkradio_fg_color: $selected_fg_color; +$checkradio_borders_color: if($variant == 'light', darken($checkradio_bg_color,20%), darken($checkradio_bg_color,40%)); diff --git a/src/themes/Kali/sass/gtk-sass/applications/gedit/Adwaita.css b/src/themes/Kali/sass/gtk-sass/applications/gedit/Adwaita.css new file mode 100644 index 00000000..784e72aa --- /dev/null +++ b/src/themes/Kali/sass/gtk-sass/applications/gedit/Adwaita.css @@ -0,0 +1,61 @@ +.gedit-document-panel { + background-color: @sidebar_bg; +} + +.gedit-document-panel:backdrop { + color: #b0b2b2; +} + +.gedit-document-panel row:selected:backdrop { + background-color: #8b8e8f; +} + +.gedit-document-panel-group-row, +.gedit-document-panel-group-row:hover { + border-top: 1px solid alpha(currentColor, 0.3); +} + +.gedit-document-panel-group-row:first-child, +.gedit-document-panel-group-row:first-child:hover { + border-top: 0px; +} + +/* Try to look as the notebook tab close button */ +.gedit-document-panel row button.flat { + padding: 0; + margin-top: 8px; + margin-bottom: 8px; + min-width: 18px; + min-height: 18px; + color: alpha(currentColor,0.3); +} + +.gedit-document-panel row:hover button.flat { + color: alpha(currentColor,0.5); +} + +.gedit-document-panel row button.flat:hover { + color: @theme_fg_color; +} + +statusbar { + border-top: 1px solid @borders; +} + +.gedit-search-slider { + background-color: @theme_base_color; + padding: 6px; + border-color: @borders; + border-radius: 0 0 3px 3px; + border-width: 0 1px 1px 1px; + border-style: solid; +} + +.gedit-search-entry-occurrences-tag { + background-color: @theme_base_color; + background-image: none; + color: shade (@theme_unfocused_fg_color, 0.8); + border: 0px; + margin: 2px; + padding: 2px; +} diff --git a/src/themes/Kali/sass/gtk-sass/applications/nautilus/Adwaita.css b/src/themes/Kali/sass/gtk-sass/applications/nautilus/Adwaita.css index 66665097..546d3e98 100644 --- a/src/themes/Kali/sass/gtk-sass/applications/nautilus/Adwaita.css +++ b/src/themes/Kali/sass/gtk-sass/applications/nautilus/Adwaita.css @@ -45,33 +45,29 @@ /* Path bar */ -.nautilus-path-bar button { /* undecorate the buttons */ +.path-bar-box { + border-radius: 5px; + border: 1px @borders solid; + background-color: @theme_bg_color; + padding-right: 6px; +} + +.nautilus-path-bar button { margin: 0px; } +.nautilus-path-bar button:first-child { + border-width: 0px 1px 0px 0px; + border-radius: 3.5px 0px 0px 3.5px; +} + +.nautilus-path-bar button:not(:first-child) { + border-width: 0px 1px 0px 1px; + border-radius: 0px 0px 0px 0px; +} + .nautilus-path-bar button:not(:checked) image { opacity: 0.8; } /* dim the icon when not checked */ -.path-bar-box { - transition: border 200ms; - transition: background-color 200ms; - border-radius: 5px; -} - -.path-bar-box.width-maximized { - border: 1px @borders solid; - background-color: @theme_bg_color; -} - -.path-bar-box.width-maximized button:first-child { - border-radius: 3.5px 0px 0px 3.5px; - border-width: 0px 1px 0px 0px; -} - -.path-bar-box.width-maximized button:not(:first-child) { - border-width: 0px 1px 0px 1px; - border-radius: 0px 0px 0px 0px; -} - /* Make the tags fit into the box */ entry.search > * { margin: 5px; diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_colors.scss b/src/themes/Kali/sass/gtk-sass/upstream/_colors.scss index e4480a06..7a7c14bb 100644 --- a/src/themes/Kali/sass/gtk-sass/upstream/_colors.scss +++ b/src/themes/Kali/sass/gtk-sass/upstream/_colors.scss @@ -73,5 +73,6 @@ $suggested_bg_color: $selected_bg_color; $suggested_border_color: $selected_borders_color; $progress_bg_color: $selected_bg_color; $progress_border_color: $selected_borders_color; -$checkradio_bg_color: $selected_bg_color; +$checkradio_bg_color: if($variant == 'light', $selected_bg_color, lighten($selected_bg_color,10%)); $checkradio_fg_color: $selected_fg_color; +$checkradio_borders_color: if($variant == 'light', darken($checkradio_bg_color,20%), darken($checkradio_bg_color,40%)); diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_common.scss b/src/themes/Kali/sass/gtk-sass/upstream/_common.scss index 0f9f1e61..70bffc07 100644 --- a/src/themes/Kali/sass/gtk-sass/upstream/_common.scss +++ b/src/themes/Kali/sass/gtk-sass/upstream/_common.scss @@ -920,14 +920,14 @@ button { $_border_bg: linear-gradient(to top, $alt-borders-color 25%, $borders-color 50%); - &:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { + &:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { @include button(normal); background-image: $button_fill, $_border_bg; border-color: transparent; } - &:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { + &:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) { @include button(hover); background-image: $button_fill, $_border_bg; @@ -1443,6 +1443,7 @@ spinbutton { padding: 1px 2px; } } + font-feature-settings: "tnum"; } @@ -2837,9 +2838,9 @@ switch { &:checked { color: $selected_fg_color; - border-color: $suggested_border_color; - background-color: $suggested_bg_color; - text-shadow: 0 1px transparentize($suggested_border_color, 0.5), + border-color: $checkradio_borders_color; + background-color: $checkradio_bg_color; + text-shadow: 0 1px transparentize($selected_borders_color, 0.5), 0 0 2px transparentize(white, 0.4); } @@ -2859,8 +2860,9 @@ switch { &:checked { @if $variant == 'light' { color: $backdrop_bg_color; } - border-color: if($variant=='light', $suggested_bg_color, $suggested_border_color); - background-color: $suggested_bg_color; + border-color: if($variant == 'light', $checkradio_borders_color, + $selected_borders_color); + background-color: $checkradio_bg_color; } &:disabled { @@ -2898,7 +2900,7 @@ switch { } } - &:checked slider { border: 1px solid $suggested_border_color; } + &:checked > slider { border: 1px solid $checkradio_borders_color; } &:disabled slider { @include button(insensitive); } @@ -2909,7 +2911,7 @@ switch { @include button(backdrop); } - &:checked slider { border-color: if($variant == 'light', $suggested_bg_color, $suggested_border_color); } + &:checked > slider { border-color: $checkradio_borders_color; } &:disabled slider { @include button(backdrop-insensitive); } } @@ -2917,11 +2919,11 @@ switch { row:selected & { @if $variant == 'light' { box-shadow: none; - border-color: $selected_borders_color; + border-color: $checkradio_borders_color; - &:backdrop { border-color: $selected_borders_color; } + &:backdrop { border-color: $checkradio_borders_color; } - slider { &:checked, & { border-color: $selected_borders_color; } } + > slider { &:checked, & { border-color: $checkradio_borders_color; } } } } @@ -2937,14 +2939,14 @@ switch { //selection-mode @each $check_state, $check_icon, $check_color, $check_background in - ('', 'none', 'transparent', '#{transparentize($checkradio_bg_color, .05)}'), - (':hover', 'none', 'transparent', '#{transparentize($checkradio_bg_color, .05)}'), - (':active', 'none', 'transparent', '#{transparentize($checkradio_bg_color, .05)}'), - (':backdrop', 'none', 'transparent', '#{transparentize(desaturate($checkradio_bg_color, 100%), .05)}'), - (':checked', '-gtk-icontheme(\'object-select-symbolic\')', '#{$osd_fg_color}', '#{transparentize($checkradio_bg_color, .05)}'), - (':checked:hover', '-gtk-icontheme(\'object-select-symbolic\')', '#{$osd_fg_color}', '#{transparentize($checkradio_bg_color, .05)}'), - (':checked:active', '-gtk-icontheme(\'object-select-symbolic\')', '#{$osd_fg_color}', '#{transparentize($checkradio_bg_color, .05)}'), - (':backdrop:checked', '-gtk-icontheme(\'object-select-symbolic\')', '#{transparentize($osd_fg_color, 0.2)}', '#{transparentize(desaturate($checkradio_bg_color, 100%), .05)}'), { + ('', 'none', 'transparent', $checkradio_bg_color), + (':hover', 'none', 'transparent', $checkradio_bg_color), + (':active', 'none', 'transparent', $checkradio_bg_color), + (':backdrop', 'none', 'transparent', '#{desaturate($checkradio_bg_color, 100%)}'), + (':checked', '-gtk-icontheme(\'object-select-symbolic\')', $osd_fg_color, $checkradio_bg_color), + (':checked:hover', '-gtk-icontheme(\'object-select-symbolic\')', $osd_fg_color, $checkradio_bg_color), + (':checked:active', '-gtk-icontheme(\'object-select-symbolic\')', $osd_fg_color, $checkradio_bg_color), + (':backdrop:checked', '-gtk-icontheme(\'object-select-symbolic\')', '#{transparentize($osd_fg_color, 0.2)}', '#{desaturate($checkradio_bg_color, 100%)}'), { .view.content-view.check#{$check_state}:not(list), .content-view .tile check#{$check_state}:not(list) { @@ -3037,7 +3039,7 @@ radio { @if $variant == 'light' { // the borders of the light variant versions of checks and radios are too similar in luminosity to the selected background // color, hence we need special casing. - row:selected & { border-color: $selected_borders_color; } + row:selected & { border-color: $checkradio_borders_color; } } .osd & { @@ -3057,6 +3059,7 @@ radio { min-height: 14px; min-width: 14px; background-image: none; + background-color: transparent; box-shadow: none; -gtk-icon-shadow: none; color: inherit; @@ -3329,7 +3332,10 @@ scale { } marks, - value { color: gtkalpha(currentColor, 0.55); } + value { + color: gtkalpha(currentColor, 0.55); + font-feature-settings: "tnum"; + } //marks margins @each $scale_orient, $marks_class, $marks_pos, $marks_margin in (horizontal, top, top, bottom), @@ -3597,6 +3603,7 @@ progressbar { // FIXME: insensitive state missing and some other state should be set probably font-size: smaller; color: transparentize($fg_color, 0.6); + font-feature-settings: "tnum"; &:backdrop { box-shadow: none; @@ -4633,6 +4640,10 @@ decoration { &:backdrop { box-shadow: inset 0 0 0 3px $backdrop_bg_color, inset 0 1px $top_hilight; } } + + window.csd & { + background: black; /* transparent makes gtk3 leak light on the corners #2537 */ + } } // Window Close button diff --git a/src/themes/Kali/sass/gtk-sass/upstream/sync.sh b/src/themes/Kali/sass/gtk-sass/upstream/sync.sh index d0f69c53..740c0380 100755 --- a/src/themes/Kali/sass/gtk-sass/upstream/sync.sh +++ b/src/themes/Kali/sass/gtk-sass/upstream/sync.sh @@ -4,22 +4,21 @@ GREEN='\033[0;32m' YELLOW='\033[0;33m' RESET='\033[0m' - -VERSION=3.24.14 +VERSION=3.24.17 echo -echo -e " [ $YELLOW"i"$RESET ] Upstream version $VERSION" +echo -e " $YELLOW[ i ]$RESET Upstream version $VERSION" echo while read file; do echo - echo -e " [ $GREEN*$RESET ] Downloading file $file" + echo -e " $GREEN[ * ]$RESET Downloading file $file" wget https://gitlab.gnome.org/GNOME/gtk/raw/$VERSION/gtk/theme/Adwaita/$file --timestamping --quiet if [ -f $file.patch ] then - echo -e " [ $YELLOW~$RESET ] Apply patch" + echo -e " $YELLOW[ ~ ]$RESET Apply patch" patch $file $file.patch --quiet fi done <<- EOF