Backport PR #13657 to fix Software Updates pane button theming

This commit is contained in:
Adam Williamson 2020-03-11 16:47:24 -07:00
parent 0cfb42d0fe
commit acef37288e
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,24 @@
From 6cfac968011d17f8ec94da8d028b6879cd3f69da Mon Sep 17 00:00:00 2001
From: Martin Pitt <martinpitt@users.noreply.github.com>
Date: Thu, 5 Mar 2020 12:13:15 +0100
Subject: [PATCH] packagekit: Add stylesheet for the Buttons on 'Software
Updates' page
Closes #13657
---
pkg/packagekit/updates.scss | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkg/packagekit/updates.scss b/pkg/packagekit/updates.scss
index 48ac3d776..2a2ab32ed 100644
--- a/pkg/packagekit/updates.scss
+++ b/pkg/packagekit/updates.scss
@@ -1,3 +1,5 @@
+@import "../../node_modules/@patternfly/patternfly/components/Button/button.scss";
+
.pk-updates--header {
display: flex;
flex-wrap: wrap;
--
2.25.1

View File

@ -1,6 +1,6 @@
# This spec file has been automatically updated # This spec file has been automatically updated
Version: 214 Version: 214
Release: 1%{?dist} Release: 2%{?dist}
# #
# This file is maintained at the following location: # This file is maintained at the following location:
# https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec # https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec
@ -62,6 +62,11 @@ Source0: cockpit-%{version}.tar.gz
Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
%endif %endif
# Fix button theming on Software Updates page
# https://github.com/cockpit-project/cockpit/issues/13653
# https://github.com/cockpit-project/cockpit/pull/13657
Patch0: 0001-packagekit-Add-stylesheet-for-the-Buttons-on-Softwar.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(json-glib-1.0)
@ -119,6 +124,7 @@ Recommends: subscription-manager-cockpit
%prep %prep
%setup -q -n cockpit-%{version} %setup -q -n cockpit-%{version}
%patch0 -p1
%build %build
exec 2>&1 exec 2>&1
@ -664,6 +670,10 @@ via PackageKit.
# The changelog is automatically generated and merged # The changelog is automatically generated and merged
%changelog %changelog
* Wed Mar 11 2020 Adam Williamson <awilliam@redhat.com> - 214-2
- Backport PR #13657 to fix Software Updates pane button theming
* Wed Mar 04 2020 Martin Pitt <mpitt@redhat.com> - 214-1 * Wed Mar 04 2020 Martin Pitt <mpitt@redhat.com> - 214-1
- Networking: List Firewall active zones when unprivileged - Networking: List Firewall active zones when unprivileged