From 1a7e59edee0a95f62728f30b71639729129d9561 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 25 Aug 2015 16:27:27 +0100 Subject: [PATCH 1/2] mainly cinnamon-settings tweaks --- cinnamon_settings_tweaks.patch | 33 +++++++++++++++++++ ...ible_menuitem_checkboxes_libreoffice.patch | 11 +++++++ zukitwo.spec | 15 ++++++++- zukitwo_fg-color-icon-c-settings-nice.patch | 21 ++++++++++++ 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 cinnamon_settings_tweaks.patch create mode 100644 fix_invisible_menuitem_checkboxes_libreoffice.patch create mode 100644 zukitwo_fg-color-icon-c-settings-nice.patch diff --git a/cinnamon_settings_tweaks.patch b/cinnamon_settings_tweaks.patch new file mode 100644 index 0000000..44bf6d3 --- /dev/null +++ b/cinnamon_settings_tweaks.patch @@ -0,0 +1,33 @@ +--- a/Zukitwo/gtk-3.0/other-applications.css 2014-06-15 17:03:36.000000000 +0100 ++++ b/Zukitwo/gtk-3.0/other-applications.css 2015-08-25 11:22:06.299829902 +0100 +@@ -180,6 +180,30 @@ NemoQueryEditor .button { + border-radius: 0; + } + ++/********************* ++ * Cinnamon Settings * ++ *********************/ ++ ++.section-bg { ++ background-color: @notebook_bg; ++ box-shadow: inset 0 3px white, ++ inset -2px 0 @border, ++ inset 0 -2px @border, ++ inset 0 2px shade(@border, 1.15), ++ inset 2px 0 @border, ++ inset -1px 0 shade(@theme_bg_color, 0.93), ++ inset 1px 0 shade(@theme_bg_color, 0.93), ++ inset 0 1px @theme_bg_color, ++ inset 0 -1px shade(@theme_bg_color, 0.85); ++} ++ ++.cs-header { ++ background-color: transparent; ++ background-image: linear-gradient(to bottom, ++ @toolbar_bg_a, ++ @toolbar_bg_b); ++} ++ + /**************** + * PopOver menu * + ****************/ diff --git a/fix_invisible_menuitem_checkboxes_libreoffice.patch b/fix_invisible_menuitem_checkboxes_libreoffice.patch new file mode 100644 index 0000000..adc9a21 --- /dev/null +++ b/fix_invisible_menuitem_checkboxes_libreoffice.patch @@ -0,0 +1,11 @@ +--- a/Zukitwo/gtk-2.0/gtkrc ++++ b/Zukitwo/gtk-2.0/gtkrc +@@ -124,7 +124,7 @@ style "murrine-default" { + base[INSENSITIVE] = @bg_color + text[NORMAL] = @text_color + text[PRELIGHT] = @text_color +- text[ACTIVE] = @selected_fg_color ++ text[ACTIVE] = @fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = darker (@bg_color) + diff --git a/zukitwo.spec b/zukitwo.spec index 4d901ea..1d7f17a 100644 --- a/zukitwo.spec +++ b/zukitwo.spec @@ -6,7 +6,7 @@ Name: zukitwo Version: 20141022 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4 Group: User Interface/Desktops @@ -21,6 +21,11 @@ Patch1: firefox_tooltip.patch Patch2: sidebar_fix.patch Patch3: make-overshoot-look-good.patch Patch4: readd_scrollbar_stepper.patch +Patch5: zukitwo_fg-color-icon-c-settings-nice.patch +Patch6: fix_invisible_menuitem_checkboxes_libreoffice.patch +Patch7: cinnamon_settings_tweaks.patch + +Requires: dos2unix BuildArch: noarch @@ -84,11 +89,15 @@ Themes for Xfwm4 as part of the %{theme_name} theme. %prep %setup -q -c -n %{name}_by_%{author}-%{tag} +dos2unix Zukitwo/gtk-2.0/gtkrc %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 # Remove "Thumbs.db" files find . -name Thumbs.db -type f -exec rm -f '{}' \; @@ -138,6 +147,10 @@ cp -pr %{shell_name}/gnome-shell/* %{buildroot}%{_datadir}/themes/%{theme_name}/ %changelog +* Tue Aug 25 2015 Leigh Scott - 20141022-10 +- mainly cinnamon-settings tweaks +- add requires dos2unix + * Wed Jul 15 2015 Leigh Scott - 20141022-9 - revert last change diff --git a/zukitwo_fg-color-icon-c-settings-nice.patch b/zukitwo_fg-color-icon-c-settings-nice.patch new file mode 100644 index 0000000..3f4c30e --- /dev/null +++ b/zukitwo_fg-color-icon-c-settings-nice.patch @@ -0,0 +1,21 @@ +--- a/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-25 16:38:22.568811000 +0200 ++++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-25 16:45:49.263402064 +0200 +@@ -3560,13 +3560,17 @@ GtkIconView.cell:selected:focus { + .cell:selected, + .cell:selected:focus { + background-color: @theme_selected_bg_color; ++ background-image: -gtk-gradient (linear, ++ left top, left bottom, ++ from (shade(@theme_selected_bg_color, 1.0)), ++ to (shade(@theme_selected_bg_color, 1.1))); + color: @theme_selected_fg_color; + } + + .cell:selected:backdrop, + .cell:selected:focus:backdrop { + background-color: shade(@theme_unfocused_bg_color, 0.94); +- color: @theme_fg_color; ++ color: @theme_selected_fg_color; + } + + row:selected, From 14c1b1fefe1323a0e46696aac7f2dd492b5464e7 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 25 Aug 2015 16:35:57 +0100 Subject: [PATCH 2/2] add buildrequires dos2unix --- zukitwo.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zukitwo.spec b/zukitwo.spec index 1d7f17a..27c0d35 100644 --- a/zukitwo.spec +++ b/zukitwo.spec @@ -25,7 +25,7 @@ Patch5: zukitwo_fg-color-icon-c-settings-nice.patch Patch6: fix_invisible_menuitem_checkboxes_libreoffice.patch Patch7: cinnamon_settings_tweaks.patch -Requires: dos2unix +BuildRequires: dos2unix BuildArch: noarch @@ -149,7 +149,7 @@ cp -pr %{shell_name}/gnome-shell/* %{buildroot}%{_datadir}/themes/%{theme_name}/ %changelog * Tue Aug 25 2015 Leigh Scott - 20141022-10 - mainly cinnamon-settings tweaks -- add requires dos2unix +- add buildrequires dos2unix * Wed Jul 15 2015 Leigh Scott - 20141022-9 - revert last change