fix(gnomesoftware): Fix style error of install and launch button on gnome-software.

- 修复应用商店应用详情页面安装和启动按钮样式错误问题,主要按钮统一改成蓝色。
This commit is contained in:
yinhongchang 2024-03-25 20:41:39 +08:00
parent bb44dce053
commit c2f5c25b39
2 changed files with 80 additions and 4 deletions

View File

@ -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

View File

@ -1,19 +1,20 @@
Name: kiran-gtk-theme
Version: 2.6.0
Release: 1%{?dist}.kb1
Release: 2
Summary: GTK+ theme designed for kiran
License: LGPLv2+
Source0: %{name}-%{version}.tar.gz
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 && 0%{kylin_sub_minor_version} == 6 )
BuildRequires: python3
BuildRequires: python3-cairo
%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
@ -40,6 +41,9 @@ make %{?_smp_mflags}
%{_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)