!23 修复应用商店应用详情页面安装和启动按钮样式错误，鼠标悬浮到按钮时完全看不清

From: @niko_yhc 
Reviewed-by: @liubuguiii 
Signed-off-by: @liubuguiii

0000-fix-gnomesoftware-Fix-style-error-of-install-and-lau.patch

@@ -0,0 +1,72 @@
+From aee8944c8ecc751800b16d581a87c63dfc525ef1 Mon Sep 17 00:00:00 2001
+From: tangjie02 <tangjie02@kylinsec.com.cn>
+Date: Sat, 23 Mar 2024 11:47:29 +0800
+Subject: [PATCH] fix(gnomesoftware): Fix style error of install and launch
+ button on gnome-software.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- 修复应用商店应用详情页面安装和启动按钮样式错误问题，主要按钮统一改成蓝色。
+
+Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
+---
+ src/gtk3/widgets/_button.scss | 18 ++++++------------
+ 1 file changed, 6 insertions(+), 12 deletions(-)
+
+diff --git a/src/gtk3/widgets/_button.scss b/src/gtk3/widgets/_button.scss
+index caff222..9a1e3b9 100644
+--- a/src/gtk3/widgets/_button.scss
++++ b/src/gtk3/widgets/_button.scss
+@@ -211,34 +211,29 @@ button {
+     }
+ 
+     // Suggested and Destructive Action buttons
+-    @each $b_type, $button_color in (suggested-action, gtk("@theme_widget_foreground_normal")),
+-                                    (destructive-action, gtk("@theme_default_error")) {
++    @each $b_type, $button_color in (suggested-action, gtk("@theme_selected_bg_color")),
++                                    (destructive-action, gtk("@theme_widget_background_normal")) {
+         &.#{$b_type},
+         &.#{$b_type}.osd & {
+             @include button(normal);
+             background-color: $button_color;
+-            color: gtk("@theme_widget_foreground_active");
++            color: gtk("@theme_widget_foreground_normal");
+             &.flat {
+                 @include button(undecorated);
+-                color: $button_color;
+             }
+             &:hover {
+                 @include button(hover);
+-                color: white; //! FIXME - No hardcoded colors.
+-                background-color: $button_color;
++                background-color: gtkmix($button_color, gtk("@theme_widget_foreground_normal"), 0.1);
+             }
+             &:active,
+-            &:checked,
+-            &:focus {
++            &:checked {
+                 @include button(active);
+-                background-color: $button_color;
+-                color: white;
++                background-color: gtkmix($button_color, gtk("@theme_widget_foreground_normal"), 0.2);
+             }
+             &:backdrop,
+             &.flat:backdrop {
+                 @include button(backdrop);
+                 background-color: $button_color;
+-                color: white;
+                 &:disabled {
+                     @include button(backdrop-insensitive);
+                 }
+@@ -247,7 +242,6 @@ button {
+             &.flat:disabled,
+             &.flat:backdrop:disabled {
+                 @include button(undecorated);
+-                color: gtkalpha($button_color, 0.8);
+             }
+             &:disabled {
+                 @include button(insensitive);
+-- 
+2.27.0
+

0001-feature-button-Delete-transition-duration-for-flat-b.patch

@@ -1,37 +0,0 @@
-From 3b08b2d8b99e2861ca80d35628cf02dfb86b97c7 Mon Sep 17 00:00:00 2001
-From: tangjie02 <tangjie02@kylinsec.com.cn>
-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 <tangjie02@kylinsec.com.cn>
----
- 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
-

kiran-gtk-theme.spec

@@ -1,19 +1,24 @@
 Name:		kiran-gtk-theme
-Version:	2.3.0
+Version:	2.6.0
 Release:	2
 Summary:	GTK+ theme designed for kiran
 
 License:	LGPLv2+
 Source0:        %{name}-%{version}.tar.gz
 
-Patch0001:      0001-feature-button-Delete-transition-duration-for-flat-b.patch
+Patch0000:      0000-fix-gnomesoftware-Fix-style-error-of-install-and-lau.patch
 
 BuildRequires:  cmake >= 3.2
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  sassc
+%if ( 0%{?kylin_major_version} == 3 && 0%{?kylin_minor_version} == 3 && "%{?ks_installclass}" == "Server"  ) 
+BuildRequires:  python36
+BuildRequires:  python36-cairo
+%else
 BuildRequires:  python%{python3_pkgversion}
 BuildRequires:  python%{python3_pkgversion}-cairo
+%endif
 
 BuildArch:      noarch
 
@@ -32,10 +37,37 @@ make %{?_smp_mflags}
 
  
 %files
-%{_datadir}/themes/Kiran/
+%{_datadir}/themes/Kiran-white/
 %{_datadir}/themes/Kiran-dark/
 
 %changelog
+* Mon Mar 25 2024 yinhongchang <yinhongchang@kylinsec.com.cn> - 2.6.0-2
+- KYOS-B:Fix style error of install and launch button on gnome-software
+
+* Mon Jan 15 2024 yuanxing <yuanxing@kylinos.com.cn> - 2.6.0-1.kb1
+- KYOS-F: change the light theme name to Kiran-white.(#24747)
+
+* Mon Dec 25 2023 yanglan <yanglan@kylinsec.com.cn> - 2.4.0-1.kb3
+- rebuild for KiranUI-2.6-next
+
+* Wed Dec 06 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.4.0-1.kb1
+- release 2.4
+
+* Tue Jun 20 2023 kpkg <kpkg.kylinsec.com.cn> - 2.3.0-6.kb1
+- rebuild for KiranUI-2.5-next
+
+* Fri May 5 2023 yinhongchang <yinhongchang@kylinos.com.cn> - 2.3.0-6
+- KYOS-F: Fix compile gtk3.0 warning.
+
+* Wed Apr 12 2023 kpkg <kpkg@kylinos.com.cn> - 2.3.0-5
+- rebuild for KY3.4-GC-KiranUI-2.5
+
+* Mon Apr 03 2023 kpkg <kpkg@kylinos.com.cn> - 2.3.0-4
+- rebuild for KiranUI-2.5-next
+
+* Mon Apr 03 2023 kpkg <kpkg@kylinos.com.cn> - 2.3.0-3
+- rebuild for KiranUI-2.5-next
+
 * Thu Oct 13 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.3.0-2
 - KYOS-F: Delete transition-duration for flat button.
 

kiran-gtk-theme.yaml

@@ -1,4 +1,4 @@
 version_control: gitee
-src_repo: https://gitee.com/openeuler/kiran-gtk-theme.git
+src_repo: openeuler/kiran-gtk-theme
-tag_prefix: "v"
+tag_prefix: "^v"
-seperator: "."
+separator: "."