diff --git a/0001-feature-button-Delete-transition-duration-for-flat-b.patch b/0001-feature-button-Delete-transition-duration-for-flat-b.patch deleted file mode 100644 index 22a0c3d..0000000 --- a/0001-feature-button-Delete-transition-duration-for-flat-b.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3b08b2d8b99e2861ca80d35628cf02dfb86b97c7 Mon Sep 17 00:00:00 2001 -From: tangjie02 -Date: Thu, 13 Oct 2022 20:34:42 +0800 -Subject: [PATCH] feature(button): Delete transition-duration for flat button. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 取消flat按钮的悬浮颜色延时，会有卡顿感觉。 - -Signed-off-by: tangjie02 ---- - src/gtk3/widgets/_button.scss | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/src/gtk3/widgets/_button.scss b/src/gtk3/widgets/_button.scss -index 9928ed9..37a45d8 100644 ---- a/src/gtk3/widgets/_button.scss -+++ b/src/gtk3/widgets/_button.scss -@@ -101,14 +101,6 @@ $_dot_color: gtk("@theme_widget_foreground_active"); - @include button(normal); - &.flat { - @include button(undecorated); -- -- &:hover { -- /* transition: $button_transition; */ -- transition-duration: 500ms; -- &:active { -- /* transition: $button_transition; */ -- } -- } - } - - &:hover { --- -2.33.0 - diff --git a/0002-fix-scss-Fix-scss-warning-Compound-selectors-may-no-.patch b/0002-fix-scss-Fix-scss-warning-Compound-selectors-may-no-.patch deleted file mode 100644 index bb8d4c8..0000000 --- a/0002-fix-scss-Fix-scss-warning-Compound-selectors-may-no-.patch +++ /dev/null @@ -1,223 +0,0 @@ -From 0138ade4c1b81c5ec5d18e91c7fb55a18c2520ff Mon Sep 17 00:00:00 2001 -From: tangjie02 -Date: Fri, 14 Oct 2022 11:47:09 +0800 -Subject: [PATCH 2/3] fix(scss): Fix scss warning "Compound selectors may no - longer be extended". -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 修复scss告警，新版本scss的extend不支持复合选择器。 - -Signed-off-by: tangjie02 ---- - src/gtk3/widgets/_base.scss | 9 ++++- - src/gtk3/widgets/_button.scss | 69 +++++++++++++++++++++++----------- - src/gtk3/widgets/_link.scss | 2 +- - src/gtk3/widgets/_menus.scss | 3 +- - src/gtk3/widgets/_sidebar.scss | 1 - - 5 files changed, 57 insertions(+), 27 deletions(-) - -diff --git a/src/gtk3/widgets/_base.scss b/src/gtk3/widgets/_base.scss -index 77c25b8..0949992 100644 ---- a/src/gtk3/widgets/_base.scss -+++ b/src/gtk3/widgets/_base.scss -@@ -178,7 +178,7 @@ label { - &:disabled { - color: gtk("@insensitive_fg_color"); - selection { -- @extend %selected_items:disabled; -+ color: gtk("@insensitive_selected_fg_color"); - } - - &:backdrop { -@@ -190,7 +190,12 @@ label { - color: gtk("@theme_unfocused_text_color"); - - selection { -- @extend %selected_items:backdrop; -+ background-color: gtk("@theme_unfocused_selected_bg_color"); -+ color: gtk("@theme_unfocused_selected_fg_color"); -+ -+ &:disabled { -+ color: gtk("@insensitive_unfocused_selected_fg_color"); -+ } - } - } - } -diff --git a/src/gtk3/widgets/_button.scss b/src/gtk3/widgets/_button.scss -index 37a45d8..7f1c3f0 100644 ---- a/src/gtk3/widgets/_button.scss -+++ b/src/gtk3/widgets/_button.scss -@@ -351,10 +351,10 @@ combobox { - &.linked { - button:nth-child(2) { - &:dir(ltr) { -- @extend %linked:last-child; -+ @extend %linked_last_child; - } - &:dir(rtl) { -- @extend %linked:first-child; -+ @extend %linked_first_child; - } - } - } -@@ -371,14 +371,14 @@ combobox { - } // specificity bump - } - --.linked:not(.vertical) > combobox:first-child > box > button.combo { @extend %linked:first-child; } --.linked:not(.vertical) > combobox:last-child > box > button.combo { @extend %linked:last-child; } --.linked:not(.vertical) > combobox:only-child > box > button.combo { @extend %linked:only-child; } -+.linked:not(.vertical) > combobox:first-child > box > button.combo { @extend %linked_first_child; } -+.linked:not(.vertical) > combobox:last-child > box > button.combo { @extend %linked_last_child; } -+.linked:not(.vertical) > combobox:only-child > box > button.combo { @extend %linked_only_child; } - - .linked.vertical > combobox > box > button.combo { @extend %linked_vertical_middle; } --.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical:first-child;} --.linked.vertical > combobox:last-child > box > button.combo { @extend %linked_vertical:last-child; } --.linked.vertical > combobox:only-child > box > button.combo { @extend %linked_vertical:only-child; } -+.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical_first_child;} -+.linked.vertical > combobox:last-child > box > button.combo { @extend %linked_vertical_last_child; } -+.linked.vertical > combobox:only-child > box > button.combo { @extend %linked_vertical_only_child; } - - %needs_attention { - animation: needs_attention 150ms ease-in; -@@ -409,49 +409,74 @@ combobox { - border-right-style: none; - } - -+%linked_first_child { -+ border-top-left-radius: $RadiusLittle; -+ border-bottom-left-radius: $RadiusLittle; -+} -+ -+%linked_last_child { -+ border-top-right-radius: $RadiusLittle; -+ border-bottom-right-radius: $RadiusLittle; -+ border-right-style: solid; -+} -+ -+%linked_only_child { -+ border-radius: $RadiusLittle; -+ border-style: solid; -+} -+ - %linked { - @extend %linked_middle; - - &:first-child { -- border-top-left-radius: $RadiusLittle; -- border-bottom-left-radius: $RadiusLittle; -+ @extend %linked_first_child; - } - - &:last-child { -- border-top-right-radius: $RadiusLittle; -- border-bottom-right-radius: $RadiusLittle; -- border-right-style: solid; -+ @extend %linked_last_child; - } - - &:only-child { -- border-radius: $RadiusLittle; -- border-style: solid; -+ @extend %linked_only_child; - } - - } - -+ - %linked_vertical_middle { - border-style: solid solid none solid; - border-radius: 0; - } - -+%linked_vertical_first_child { -+ border-top-left-radius: $RadiusLittle; -+ border-top-right-radius: $RadiusLittle; -+} -+ -+%linked_vertical_last_child { -+ border-bottom-left-radius: $RadiusLittle; -+ border-bottom-right-radius: $RadiusLittle; -+ border-style: solid; -+} -+ -+%linked_vertical_only_child { -+ border-radius: $RadiusLittle; -+ border-style: solid; -+} -+ - %linked_vertical { - @extend %linked_vertical_middle; - - &:first-child { -- border-top-left-radius: $RadiusLittle; -- border-top-right-radius: $RadiusLittle; -+ @extend %linked_vertical_first_child; - } - - &:last-child { -- border-bottom-left-radius: $RadiusLittle; -- border-bottom-right-radius: $RadiusLittle; -- border-style: solid; -+ @extend %linked_vertical_last_child; - } - - &:only-child { -- border-radius: $RadiusLittle; -- border-style: solid; -+ @extend %linked_vertical_only_child; - } - } - -diff --git a/src/gtk3/widgets/_link.scss b/src/gtk3/widgets/_link.scss -index b4b3399..3276400 100644 ---- a/src/gtk3/widgets/_link.scss -+++ b/src/gtk3/widgets/_link.scss -@@ -50,7 +50,7 @@ button:link, - button:visited { - @extend %undecorated_button; - -- @extend *:link; -+ @extend %link; - - text-shadow: none; - -diff --git a/src/gtk3/widgets/_menus.scss b/src/gtk3/widgets/_menus.scss -index 785ec76..94390dc 100644 ---- a/src/gtk3/widgets/_menus.scss -+++ b/src/gtk3/widgets/_menus.scss -@@ -164,6 +164,7 @@ menuitem { - * Popovers * - ***************/ - /* menu buttons */ -+%modelbutton_flat, - modelbutton.flat, - .menuitem.button.flat { - min-height: 16px; -@@ -254,6 +255,6 @@ popover.background { - - checkbutton, - radiobutton { -- @extend modelbutton.flat; -+ @extend %modelbutton_flat; - } - } -\ No newline at end of file -diff --git a/src/gtk3/widgets/_sidebar.scss b/src/gtk3/widgets/_sidebar.scss -index b9c6cd2..b1c07e0 100644 ---- a/src/gtk3/widgets/_sidebar.scss -+++ b/src/gtk3/widgets/_sidebar.scss -@@ -71,7 +71,6 @@ placessidebar { - } - - @at-root button.sidebar-button { -- @extend %button_basic.flat; - - @extend %undecorated_button; - --- -2.40.1.windows.1 - diff --git a/0003-fix-gtk-warning-Fix-compile-gtk3.0-warning.patch b/0003-fix-gtk-warning-Fix-compile-gtk3.0-warning.patch deleted file mode 100644 index c0bda30..0000000 --- a/0003-fix-gtk-warning-Fix-compile-gtk3.0-warning.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 120ba95d3b59f667ea5e434e0deb954ae9a034f9 Mon Sep 17 00:00:00 2001 -From: niko_yhc -Date: Fri, 5 May 2023 11:39:15 +0800 -Subject: [PATCH 3/3] fix(gtk-warning):Fix compile gtk3.0 warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 修复引用gtk3.0库引起的告警 - -Fixes #68185 ---- - src/build-theme.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/build-theme.sh b/src/build-theme.sh -index 1b69749..e61a96e 100755 ---- a/src/build-theme.sh -+++ b/src/build-theme.sh -@@ -31,6 +31,7 @@ render_theme () { - -g "$3/gtk-2.0" -G "$3" -b "$4" - - sassc -I "$3" gtk3/gtk.scss "$3/gtk-3.0/gtk.css" -+ sed -i '1d' "$3/gtk-3.0/gtk.css" - rm -f "$3/_global.scss" - - # assets --- -2.40.1.windows.1 - diff --git a/kiran-gtk-theme-2.3.0.tar.gz b/kiran-gtk-theme-2.3.0.tar.gz deleted file mode 100644 index 5df46a0..0000000 Binary files a/kiran-gtk-theme-2.3.0.tar.gz and /dev/null differ diff --git a/kiran-gtk-theme-2.4.0.tar.gz b/kiran-gtk-theme-2.4.0.tar.gz new file mode 100644 index 0000000..be4a417 Binary files /dev/null and b/kiran-gtk-theme-2.4.0.tar.gz differ diff --git a/kiran-gtk-theme.spec b/kiran-gtk-theme.spec index 7066b54..64d1d5f 100644 --- a/kiran-gtk-theme.spec +++ b/kiran-gtk-theme.spec @@ -1,15 +1,11 @@ Name: kiran-gtk-theme -Version: 2.3.0 -Release: 6 +Version: 2.4.0 +Release: 1 Summary: GTK+ theme designed for kiran License: LGPLv2+ Source0: %{name}-%{version}.tar.gz -Patch0001: 0001-feature-button-Delete-transition-duration-for-flat-b.patch -Patch0002: 0002-fix-scss-Fix-scss-warning-Compound-selectors-may-no-.patch -Patch0003: 0003-fix-gtk-warning-Fix-compile-gtk3.0-warning.patch - BuildRequires: cmake >= 3.2 BuildRequires: gcc BuildRequires: gcc-c++ @@ -38,6 +34,9 @@ make %{?_smp_mflags} %{_datadir}/themes/Kiran-dark/ %changelog +* Tue Sep 5 2023 yinhongchang - 2.4.0-1 +- KYOS-F: fixed font not centered in buttton in audacity toolbar.(#13006) + * Fri May 5 2023 yinhongchang - 2.3.0-6 - KYOS-F: Fix compile gtk3.0 warning.