From 68d188b84b33ea8c446e8d8f0b0cf1708b84c1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Thu, 4 Mar 2021 09:25:24 +0100 Subject: [PATCH] Revert "GTK3: Match gtk4 widget sizes" This reverts commit bcda0430362fa4bebe08fe588bc541549f4fec33. --- src/themes/Kali/sass/gtk3/_common-tweaks.scss | 2 +- src/themes/Kali/sass/gtk3/upstream/_common.scss | 4 ++-- src/themes/Kali/sass/gtk3/upstream/_common.scss.patch | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/themes/Kali/sass/gtk3/_common-tweaks.scss b/src/themes/Kali/sass/gtk3/_common-tweaks.scss index 9b3981b7..01f25616 100644 --- a/src/themes/Kali/sass/gtk3/_common-tweaks.scss +++ b/src/themes/Kali/sass/gtk3/_common-tweaks.scss @@ -291,7 +291,7 @@ notebook { tab { border-radius: $button_radius; transition: $button_transition; - min-height: 28px; + min-height: 24px; button.flat { margin-top: 1px; diff --git a/src/themes/Kali/sass/gtk3/upstream/_common.scss b/src/themes/Kali/sass/gtk3/upstream/_common.scss index dae30582..eec5f334 100644 --- a/src/themes/Kali/sass/gtk3/upstream/_common.scss +++ b/src/themes/Kali/sass/gtk3/upstream/_common.scss @@ -6,13 +6,13 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94); $asset_suffix: if($variant=='dark', '-dark', ''); $backdrop_transition: 200ms ease-out; $button_transition: all 200ms $ease-out-quad; -$button_radius: 6px; +$button_radius: 4px; $menu_radius: 5px; $window_radius: $button_radius + 3; $popover_radius: $button_radius + 4; // Optional compact sizes for buttons, headerbar and headerbar widgets -$_sizevariant: 'default'; //compact otherwise +$_sizevariant: 'compact'; //compact otherwise $_headerbar_height: if($_sizevariant=='default', 46px, 40px); $_entry_height: if($_sizevariant=='default', 32px, 28px); $_btn_pad: if($_sizevariant=='default', 4px 9px, 2px 6px); diff --git a/src/themes/Kali/sass/gtk3/upstream/_common.scss.patch b/src/themes/Kali/sass/gtk3/upstream/_common.scss.patch index 21066f06..c0c35ebb 100644 --- a/src/themes/Kali/sass/gtk3/upstream/_common.scss.patch +++ b/src/themes/Kali/sass/gtk3/upstream/_common.scss.patch @@ -1,4 +1,9 @@ 9c9 < $button_radius: 5px; --- -> $button_radius: 6px; +> $button_radius: 4px; + +15c15 +< $_sizevariant: 'default'; //compact otherwise +--- +> $_sizevariant: 'compact'; //compact otherwise