From 3dcca6e95b55b91f363cab1064627c93f3e66b2a Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 24 Aug 2015 15:51:25 +0100 Subject: [PATCH 01/12] add raveit65 theme fixes for gtk-3.18 --- zukitwo.spec | 11 ++++- zukitwo_adjust-sidbar-in-dialog-open.patch | 57 ++++++++++++++++++++++ zukitwo_index-theme-correction.patch | 8 +++ zukitwo_no-shadow-for-list-rows.patch | 14 ++++++ 4 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 zukitwo_adjust-sidbar-in-dialog-open.patch create mode 100644 zukitwo_index-theme-correction.patch create mode 100644 zukitwo_no-shadow-for-list-rows.patch diff --git a/zukitwo.spec b/zukitwo.spec index 4d901ea..55542a2 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,9 @@ Patch1: firefox_tooltip.patch Patch2: sidebar_fix.patch Patch3: make-overshoot-look-good.patch Patch4: readd_scrollbar_stepper.patch +Patch5: zukitwo_index-theme-correction.patch +Patch6: zukitwo_no-shadow-for-list-rows.patch +Patch7: zukitwo_adjust-sidbar-in-dialog-open.patch BuildArch: noarch @@ -89,6 +92,9 @@ Themes for Xfwm4 as part of the %{theme_name} theme. %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 +144,9 @@ cp -pr %{shell_name}/gnome-shell/* %{buildroot}%{_datadir}/themes/%{theme_name}/ %changelog +* Mon Aug 24 2015 Leigh Scott - 20141022-10 +- add raveit65 theme fixes for gtk-3.18 + * Wed Jul 15 2015 Leigh Scott - 20141022-9 - revert last change diff --git a/zukitwo_adjust-sidbar-in-dialog-open.patch b/zukitwo_adjust-sidbar-in-dialog-open.patch new file mode 100644 index 0000000..47f9683 --- /dev/null +++ b/zukitwo_adjust-sidbar-in-dialog-open.patch @@ -0,0 +1,57 @@ +diff -upr a/Zukitwo/gtk-3.0/gtk-widgets.css b/Zukitwo/gtk-3.0/gtk-widgets.css +--- a/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-13 10:01:15.899173000 +0200 ++++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-13 10:17:20.937364715 +0200 +@@ -2012,6 +2012,11 @@ GtkFileChooserButton GtkImage:last-child + color: @internal_element_color; + } + ++GtkFileChooserWidget.vertical GtkPaned.horizontal { ++ -GtkPaned-handle-size: 3px; ++ border-color: transparent; ++} ++ + /************** + * Scrollbars * + **************/ +@@ -2739,6 +2744,41 @@ GtkMessageDialog { + border-style: none; + } + ++/* dialog open */ ++.sidebar.list, ++.sidebar.list .button { ++ background-color: @sidebar_bg; ++} ++ ++.sidebar-revealer .sidebar-button.image-button.button { ++ background-color: transparent; ++ background-image: none; ++ border-image:none; ++ box-shadow: none; ++} ++ ++.sidebar.list .button { ++ padding: 4px 8px 4px 6px; ++} ++ ++.sidebar.list .button:selected { ++ border-width: 0; ++ border-style: solid; ++ border-color: shade (@theme_selected_bg_color, 0.85); ++ background-image: linear-gradient(to bottom, ++ shade (@theme_selected_bg_color, 1.0), ++ shade (@theme_selected_bg_color, 1.0)); ++ box-shadow: none; ++} ++ ++.sidebar.list .button:hover { ++ background-color: shade (@theme_bg_color, 0.95); ++} ++ ++.sidebar.list .button .sidebar-label { ++ padding: 0px 8px; ++} ++ + .sidebar row:hover { + background-color: shade (@theme_bg_color, 0.95); + } diff --git a/zukitwo_index-theme-correction.patch b/zukitwo_index-theme-correction.patch new file mode 100644 index 0000000..558bb1e --- /dev/null +++ b/zukitwo_index-theme-correction.patch @@ -0,0 +1,8 @@ +diff -upr a/Zukitwo/index.theme b/Zukitwo/index.theme +--- a/Zukitwo/index.theme 2015-08-13 10:00:58.562989000 +0200 ++++ b/Zukitwo/index.theme 2015-08-13 10:05:03.784584855 +0200 +@@ -8,3 +8,4 @@ Encoding=UTF-8 + GtkTheme=Zukitwo + MetacityTheme=Zukitwo + ButtonLayout=:minimize,maximize,close ++IconTheme=gnome diff --git a/zukitwo_no-shadow-for-list-rows.patch b/zukitwo_no-shadow-for-list-rows.patch new file mode 100644 index 0000000..5633cb4 --- /dev/null +++ b/zukitwo_no-shadow-for-list-rows.patch @@ -0,0 +1,14 @@ +diff -upr a/Zukitwo/gtk-3.0/gtk-widgets.css b/Zukitwo/gtk-3.0/gtk-widgets.css +--- a/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-13 10:01:15.899173000 +0200 ++++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-13 10:17:20.937364715 +0200 +@@ -3596,7 +3636,9 @@ row:selected:focus:backdrop { + GtkTreeView row:nth-child(even), + GtkTreeView row:nth-child(odd) { + background-color: shade (@theme_base_color, 1.0); +- box-shadow: inset 0 -1px 0 0 alpha (@theme_bg_color, 0.4); ++/* since gtk+-3.18, better no shadow */ ++/* box-shadow: inset 0 -1px 0 0 alpha (@theme_bg_color, 0.4); */ ++ box-shadow: none; + } + + GtkTreeView row:nth-child(odd):hover, From 98f2f7133179fae8a5036563d196e150f77d4982 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 25 Aug 2015 10:38:00 +0100 Subject: [PATCH 02/12] fix GtkComboBox font color --- GtkComboBox_font_color.patch | 13 +++++++++++++ zukitwo.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 GtkComboBox_font_color.patch diff --git a/GtkComboBox_font_color.patch b/GtkComboBox_font_color.patch new file mode 100644 index 0000000..2021027 --- /dev/null +++ b/GtkComboBox_font_color.patch @@ -0,0 +1,13 @@ +--- a/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-24 13:48:33.000000000 +0100 ++++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-25 10:27:23.348650239 +0100 +@@ -1985,10 +1985,6 @@ GtkComboBox.combobox-entry .button:activ + } + + GtkComboBox .button { +- color: @internal_element_color; +-} +- +-GtkComboBox .button:hover { + color: @theme_text_color; + } + diff --git a/zukitwo.spec b/zukitwo.spec index 55542a2..e639b0f 100644 --- a/zukitwo.spec +++ b/zukitwo.spec @@ -6,7 +6,7 @@ Name: zukitwo Version: 20141022 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4 Group: User Interface/Desktops @@ -24,6 +24,7 @@ Patch4: readd_scrollbar_stepper.patch Patch5: zukitwo_index-theme-correction.patch Patch6: zukitwo_no-shadow-for-list-rows.patch Patch7: zukitwo_adjust-sidbar-in-dialog-open.patch +Patch8: GtkComboBox_font_color.patch BuildArch: noarch @@ -95,6 +96,7 @@ Themes for Xfwm4 as part of the %{theme_name} theme. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 # Remove "Thumbs.db" files find . -name Thumbs.db -type f -exec rm -f '{}' \; @@ -144,6 +146,9 @@ cp -pr %{shell_name}/gnome-shell/* %{buildroot}%{_datadir}/themes/%{theme_name}/ %changelog +* Tue Aug 25 2015 Leigh Scott - 20141022-11 +- fix GtkComboBox font color + * Mon Aug 24 2015 Leigh Scott - 20141022-10 - add raveit65 theme fixes for gtk-3.18 From 33ee4522f4335c686397c1f5a5ec83edbab4fdc0 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 25 Aug 2015 14:37:54 +0100 Subject: [PATCH 03/12] add cinnamon-settings tweaks --- cinnamon_settings_tweaks.patch | 33 +++++++++++++++++++++++++++++++++ zukitwo.spec | 7 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 cinnamon_settings_tweaks.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/zukitwo.spec b/zukitwo.spec index e639b0f..dcb4742 100644 --- a/zukitwo.spec +++ b/zukitwo.spec @@ -6,7 +6,7 @@ Name: zukitwo Version: 20141022 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4 Group: User Interface/Desktops @@ -25,6 +25,7 @@ Patch5: zukitwo_index-theme-correction.patch Patch6: zukitwo_no-shadow-for-list-rows.patch Patch7: zukitwo_adjust-sidbar-in-dialog-open.patch Patch8: GtkComboBox_font_color.patch +Patch9: cinnamon_settings_tweaks.patch BuildArch: noarch @@ -97,6 +98,7 @@ Themes for Xfwm4 as part of the %{theme_name} theme. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 # Remove "Thumbs.db" files find . -name Thumbs.db -type f -exec rm -f '{}' \; @@ -146,6 +148,9 @@ cp -pr %{shell_name}/gnome-shell/* %{buildroot}%{_datadir}/themes/%{theme_name}/ %changelog +* Tue Aug 25 2015 Leigh Scott - 20141022-12 +- add cinnamon-settings tweaks + * Tue Aug 25 2015 Leigh Scott - 20141022-11 - fix GtkComboBox font color From 09ecdd9db06ac599dc5f320df66fded85b8f9e46 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 25 Aug 2015 16:07:15 +0100 Subject: [PATCH 04/12] more cinnamon-settings tweaks --- zukitwo.spec | 7 ++++++- zukitwo_fg-color-icon-c-settings-nice.patch | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 zukitwo_fg-color-icon-c-settings-nice.patch diff --git a/zukitwo.spec b/zukitwo.spec index dcb4742..e0f8e34 100644 --- a/zukitwo.spec +++ b/zukitwo.spec @@ -6,7 +6,7 @@ Name: zukitwo Version: 20141022 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4 Group: User Interface/Desktops @@ -26,6 +26,7 @@ Patch6: zukitwo_no-shadow-for-list-rows.patch Patch7: zukitwo_adjust-sidbar-in-dialog-open.patch Patch8: GtkComboBox_font_color.patch Patch9: cinnamon_settings_tweaks.patch +Patch10: zukitwo_fg-color-icon-c-settings-nice.patch BuildArch: noarch @@ -99,6 +100,7 @@ Themes for Xfwm4 as part of the %{theme_name} theme. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 # Remove "Thumbs.db" files find . -name Thumbs.db -type f -exec rm -f '{}' \; @@ -148,6 +150,9 @@ cp -pr %{shell_name}/gnome-shell/* %{buildroot}%{_datadir}/themes/%{theme_name}/ %changelog +* Tue Aug 25 2015 Leigh Scott - 20141022-13 +- more cinnamon-settings tweaks + * Tue Aug 25 2015 Leigh Scott - 20141022-12 - add cinnamon-settings tweaks 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..a68ef64 --- /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 +@@ -3596,13 +3596,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 1a7e59edee0a95f62728f30b71639729129d9561 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 25 Aug 2015 16:27:27 +0100 Subject: [PATCH 05/12] 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 eab941d30f3133a9ec40d3941533a1c93765c753 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 25 Aug 2015 16:29:57 +0100 Subject: [PATCH 06/12] Revert "mainly cinnamon-settings tweaks" This reverts commit 1a7e59edee0a95f62728f30b71639729129d9561. --- 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, 1 insertion(+), 79 deletions(-) delete mode 100644 cinnamon_settings_tweaks.patch delete mode 100644 fix_invisible_menuitem_checkboxes_libreoffice.patch delete mode 100644 zukitwo_fg-color-icon-c-settings-nice.patch diff --git a/cinnamon_settings_tweaks.patch b/cinnamon_settings_tweaks.patch deleted file mode 100644 index 44bf6d3..0000000 --- a/cinnamon_settings_tweaks.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 deleted file mode 100644 index adc9a21..0000000 --- a/fix_invisible_menuitem_checkboxes_libreoffice.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 1d7f17a..4d901ea 100644 --- a/zukitwo.spec +++ b/zukitwo.spec @@ -6,7 +6,7 @@ Name: zukitwo Version: 20141022 -Release: 10%{?dist} +Release: 9%{?dist} Summary: Themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4 Group: User Interface/Desktops @@ -21,11 +21,6 @@ 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 @@ -89,15 +84,11 @@ 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 '{}' \; @@ -147,10 +138,6 @@ 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 deleted file mode 100644 index 3f4c30e..0000000 --- a/zukitwo_fg-color-icon-c-settings-nice.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 31f01b27cd96b3c368a22dcb6b56453dff1843c1 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 7 Sep 2015 16:55:43 +0100 Subject: [PATCH 07/12] switch to my own source --- .gitignore | 1 + GtkComboBox_font_color.patch | 13 -- cinnamon_settings_tweaks.patch | 33 ---- firefox_tooltip.patch | 12 -- make-overshoot-look-good.patch | 209 -------------------- readd_scrollbar_stepper.patch | 12 -- sidebar_fix.patch | 22 --- sources | 2 +- zukitwo-rm_unity.patch | 8 - zukitwo.spec | 109 +++------- zukitwo_adjust-sidbar-in-dialog-open.patch | 57 ------ zukitwo_fg-color-icon-c-settings-nice.patch | 21 -- zukitwo_index-theme-correction.patch | 8 - zukitwo_no-shadow-for-list-rows.patch | 14 -- 14 files changed, 25 insertions(+), 496 deletions(-) delete mode 100644 GtkComboBox_font_color.patch delete mode 100644 cinnamon_settings_tweaks.patch delete mode 100644 firefox_tooltip.patch delete mode 100644 make-overshoot-look-good.patch delete mode 100644 readd_scrollbar_stepper.patch delete mode 100644 sidebar_fix.patch delete mode 100644 zukitwo-rm_unity.patch delete mode 100644 zukitwo_adjust-sidbar-in-dialog-open.patch delete mode 100644 zukitwo_fg-color-icon-c-settings-nice.patch delete mode 100644 zukitwo_index-theme-correction.patch delete mode 100644 zukitwo_no-shadow-for-list-rows.patch diff --git a/.gitignore b/.gitignore index 67abf0c..78482a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zukitwo_by_lassekongo83-d3df2ot.zip +/gtk3.18-0.0.1.tar.gz diff --git a/GtkComboBox_font_color.patch b/GtkComboBox_font_color.patch deleted file mode 100644 index 2021027..0000000 --- a/GtkComboBox_font_color.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-24 13:48:33.000000000 +0100 -+++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-25 10:27:23.348650239 +0100 -@@ -1985,10 +1985,6 @@ GtkComboBox.combobox-entry .button:activ - } - - GtkComboBox .button { -- color: @internal_element_color; --} -- --GtkComboBox .button:hover { - color: @theme_text_color; - } - diff --git a/cinnamon_settings_tweaks.patch b/cinnamon_settings_tweaks.patch deleted file mode 100644 index 44bf6d3..0000000 --- a/cinnamon_settings_tweaks.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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/firefox_tooltip.patch b/firefox_tooltip.patch deleted file mode 100644 index 3b354ba..0000000 --- a/firefox_tooltip.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Zukitwo/gtk-3.0/gtk-widgets.css 2014-10-22 09:04:18.000000000 +0100 -+++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-04-01 13:52:00.725895000 +0100 -@@ -134,7 +134,8 @@ GtkTextView { - /************ - * Tooltips * - ************/ --.tooltip { -+.tooltip, -+.tooltip.background { - padding: 4px; - border-style: solid; - border-width: 1px; diff --git a/make-overshoot-look-good.patch b/make-overshoot-look-good.patch deleted file mode 100644 index 40b43cc..0000000 --- a/make-overshoot-look-good.patch +++ /dev/null @@ -1,209 +0,0 @@ -From 0b8043ccdcfd689820d2bc492e1880f1d17a99f0 Mon Sep 17 00:00:00 2001 -From: leigh123linux -Date: Fri, 3 Jul 2015 17:06:30 +0100 -Subject: [PATCH] make overshoot look good - ---- - Zukitwo/gtk-3.0/gtk-widgets.css | 184 +++++++++++++++++++++++++++++++++++++++- - 1 file changed, 181 insertions(+), 3 deletions(-) - -diff --git a/Zukitwo/gtk-3.0/gtk-widgets.css b/Zukitwo/gtk-3.0/gtk-widgets.css -index cc44908..2ae3ede 100644 ---- a/Zukitwo/gtk-3.0/gtk-widgets.css -+++ b/Zukitwo/gtk-3.0/gtk-widgets.css -@@ -183,11 +183,189 @@ GtkTextView { - border-radius: 0px; - } - --.overshoot, --.sidebar.overshoot { -- background-color: alpha (@theme_selected_bg_color, 0.35); -+/************************ -+ * overshoot/undershoot * -+ ************************/ -+ -+/* displays at end of mouse scrolling */ -+.overshoot.top { -+ background-image: -gtk-gradient(radial, -+ center top, 0, -+ center top, 0.5, -+ to(@overshoot_bg_color), -+ to(rgba(137, 158, 179, 0))), -+ -gtk-gradient(radial, -+ center top, 0, -+ center top, 0.6, -+ from(rgba(56, 73, 87, 0.17)), -+ to(rgba(56, 73, 87, 0))); -+ background-size: 100% 5%, 100% 100%; -+ background-repeat: no-repeat; -+ background-position: center top; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.top:backdrop { -+ background-image: -gtk-gradient(radial, -+ center top, 0, -+ center top, 0.5, -+ to(@overshoot_backdrop_bg_color), -+ to(rgba(131, 137, 145, 0))); -+ background-size: 100% 5%; -+ background-repeat: no-repeat; -+ background-position: center top; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.bottom { -+ background-image: -gtk-gradient(radial, -+ center bottom, 0, -+ center bottom, 0.5, -+ to(@overshoot_bg_color), -+ to(rgba(137, 158, 179, 0))), -+ -gtk-gradient(radial, -+ center bottom, 0, -+ center bottom, 0.6, -+ from(rgba(56, 73, 87, 0.17)), -+ to(rgba(56, 73, 87, 0))); -+ background-size: 100% 5%, 100% 100%; -+ background-repeat: no-repeat; -+ background-position: center bottom; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.bottom:backdrop { -+ background-image: -gtk-gradient(radial, -+ center bottom, 0, -+ center bottom, 0.5, -+ to(@overshoot_backdrop_bg_color), -+ to(rgba(131, 137, 145, 0))); -+ background-size: 100% 5%; -+ background-repeat: no-repeat; -+ background-position: center bottom; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.left { -+ background-image: -gtk-gradient(radial, -+ left center, 0, -+ left center, 0.5, -+ to(@overshoot_bg_color), -+ to(rgba(137, 158, 179, 0))), -+ -gtk-gradient(radial, -+ left center, 0, -+ left center, 0.6, -+ from(rgba(56, 73, 87, 0.07)), -+ to(rgba(56, 73, 87, 0))); -+ background-size: 5% 100%, 100% 100%; -+ background-repeat: no-repeat; -+ background-position: left center; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.left:backdrop { -+ background-image: -gtk-gradient(radial, -+ left center, 0, -+ left center, 0.5, -+ to(@overshoot_backdrop_bg_color), -+ to(rgba(131, 137, 145, 0))); -+ background-size: 5% 100%; -+ background-repeat: no-repeat; -+ background-position: left center; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.right { -+ background-image: -gtk-gradient(radial, -+ right center, 0, -+ right center, 0.5, -+ to(@overshoot_bg_color), -+ to(rgba(137, 158, 179, 0))), -+ -gtk-gradient(radial, -+ right center, 0, -+ right center, 0.6, -+ from(rgba(56, 73, 87, 0.07)), -+ to(rgba(56, 73, 87, 0))); -+ background-size: 5% 100%, 100% 100%; -+ background-repeat: no-repeat; -+ background-position: right center; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.right:backdrop { -+ background-image: -gtk-gradient(radial, -+ right center, 0, -+ right center, 0.5, -+ to(@overshoot_backdrop_bg_color), -+ to(rgba(131, 137, 145, 0))); -+ background-size: 5% 100%; -+ background-repeat: no-repeat; -+ background-position: right center; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+/* result is disable undershoot */ -+.undershoot.top { -+ background-color: transparent; -+ background-image: linear-gradient(to left, -+ rgba(255, 255, 255, 0.2) 50%, -+ rgba(0, 0, 0, 0.2) 50%); -+ background-size: 10px 0px; -+ background-repeat: repeat-x; -+ background-origin: content-box; -+ background-position: center top; -+} -+ -+.undershoot.bottom { -+ background-color: transparent; -+ background-image: linear-gradient(to left, -+ rgba(255, 255, 255, 0.2) 50%, -+ rgba(0, 0, 0, 0.2) 50%); -+ background-size: 10px 0px; -+ background-repeat: repeat-x; -+ background-origin: content-box; -+ background-position: center bottom; -+} -+ -+.undershoot.left { -+ background-color: transparent; -+ background-image: linear-gradient(to top, -+ rgba(255, 255, 255, 0.2) 50%, -+ rgba(0, 0, 0, 0.2) 50%); -+ background-size: 0px 10px; -+ background-repeat: repeat-y; -+ background-origin: content-box; -+ background-position: left center; -+} -+ -+.undershoot.right { -+ background-color: transparent; -+ background-image: linear-gradient(to top, -+ rgba(255, 255, 255, 0.2) 50%, -+ rgba(0, 0, 0, 0.2) 50%); -+ background-size: 0px 10px; -+ background-repeat: repeat-y; -+ background-origin: content-box; -+ background-position: right center; - } - -+ - GtkStatusbar { - padding: 5px; - color: @theme_fg_color; --- -2.4.3 - diff --git a/readd_scrollbar_stepper.patch b/readd_scrollbar_stepper.patch deleted file mode 100644 index 4c98a8b..0000000 --- a/readd_scrollbar_stepper.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Zukitwo/gtk-3.0/gtk-widgets.css 2015-07-04 06:00:02.000000000 +0100 -+++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-07-15 15:42:18.862738729 +0100 -@@ -2020,8 +2020,8 @@ GtkFileChooserButton GtkImage:last-child - background-image: none; - border-style: solid; - -GtkRange-trough-border: 0; -- -GtkScrollbar-has-backward-stepper: false; -- -GtkScrollbar-has-forward-stepper: false; -+ -GtkScrollbar-has-backward-stepper: true; -+ -GtkScrollbar-has-forward-stepper: true; - -GtkRange-slider-width: 13; - -GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */ diff --git a/sidebar_fix.patch b/sidebar_fix.patch deleted file mode 100644 index f66737b..0000000 --- a/sidebar_fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Zukitwo/gtk-3.0/gtk-widgets.css 2015-04-07 13:54:37.432443000 +0100 -+++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-04-07 13:57:10.805998436 +0100 -@@ -183,7 +183,8 @@ GtkTextView { - border-radius: 0px; - } - --.overshoot { -+.overshoot, -+.sidebar.overshoot { - background-color: alpha (@theme_selected_bg_color, 0.35); - } - -@@ -2552,8 +2553,7 @@ GtkMessageDialog { - * Sidebar * - ***********/ - .sidebar, --.sidebar .view, --.sidebar GtkScrolledWindow { -+.sidebar .view { - background-color: @sidebar_bg; - } - diff --git a/sources b/sources index f9d2a81..2fe4249 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1e573dbe63407aaa607d2d1e8e11839b zukitwo_by_lassekongo83-d3df2ot.zip +82f70f8826e3c8fd0203cf54f016e235 gtk3.18-0.0.1.tar.gz diff --git a/zukitwo-rm_unity.patch b/zukitwo-rm_unity.patch deleted file mode 100644 index b881a65..0000000 --- a/zukitwo-rm_unity.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/Zukitwo/gtk-3.0/gtk-main.css 2014-10-17 09:49:30.000000000 +0100 -+++ b/Zukitwo/gtk-3.0/gtk-main.css 2015-01-21 18:47:32.164666791 +0000 -@@ -219,5 +219,4 @@ - @import url("gtk-widgets.css"); - /*@import url("gnome-applications.css");*/ - @import url("other-applications.css"); --@import url("unity.css"); - @import url("window-controls.css"); diff --git a/zukitwo.spec b/zukitwo.spec index e0f8e34..e8d4a10 100644 --- a/zukitwo.spec +++ b/zukitwo.spec @@ -1,155 +1,92 @@ %global theme_name Zukitwo -%global shell_name ZukiShell -%global deviantart_id 203936861 -%global author lassekongo83 -%global tag d3df2ot +%global gtk_ver gtk3.18 Name: zukitwo -Version: 20141022 -Release: 13%{?dist} -Summary: Themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4 -Group: User Interface/Desktops +Epoch: 1 +Version: 0.0.1 +Release: 1%{?dist} +Summary: Themes for GTK+2, GTK+3 and Metacity License: GPLv3 -URL: http://%{author}.deviantart.com/art/%{theme_name}-%{deviantart_id} -Source0: http://www.deviantart.com/download/%{deviantart_id}/%{name}_by_%{author}-%{tag}.zip - -# This patch removes two references to Unity-related stuff from -# Zukitwo/gtk-3.0/gtk.css -Patch0: %{name}-rm_unity.patch -Patch1: firefox_tooltip.patch -Patch2: sidebar_fix.patch -Patch3: make-overshoot-look-good.patch -Patch4: readd_scrollbar_stepper.patch -Patch5: zukitwo_index-theme-correction.patch -Patch6: zukitwo_no-shadow-for-list-rows.patch -Patch7: zukitwo_adjust-sidbar-in-dialog-open.patch -Patch8: GtkComboBox_font_color.patch -Patch9: cinnamon_settings_tweaks.patch -Patch10: zukitwo_fg-color-icon-c-settings-nice.patch +URL: https://github.com/leigh123linux/Zukitwo +Source0: https://github.com/leigh123linux/Zukitwo/archive/%{gtk_ver}-%{version}.tar.gz BuildArch: noarch %description -The %{theme_name} themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4, -created by %{author}. - +The %{theme_name} themes for GTK+2, GTK+3 and Metacity. %package common Summary: Files common to %{theme_name} themes Group: User Interface/Desktops +Obsoletes: gnome-shell-theme-zukitwo +Obsoletes: zukitwo-xfwm4-theme %description common Files which are common to all %{theme_name} themes. - %package gtk2-theme Summary: %{theme_name} GTK+2 themes Group: User Interface/Desktops -Requires: %{name}-common = %{version}-%{release}, gtk-murrine-engine >= 0.98.1.1, gtk2-engines +Requires: %{name}-common = %{?epoch}:%{version}-%{release}, gtk-murrine-engine >= 0.98.1.1, gtk2-engines %description gtk2-theme Themes for GTK+2 as part of the %{theme_name} theme. - %package gtk3-theme Summary: %{theme_name} GTK+3 themes Group: User Interface/Desktops -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-common = %{?epoch}:%{version}-%{release} %description gtk3-theme Themes for GTK+3 as part of the %{theme_name} theme. - %package metacity-theme Summary: %{theme_name} Metacity themes Group: User Interface/Desktops -Requires: %{name}-common = %{version}-%{release}, metacity +Requires: %{name}-common = %{?epoch}:%{version}-%{release}, metacity %description metacity-theme Themes for Metacity as part of the %{theme_name} theme. - -%package -n gnome-shell-theme-%{name} -Summary: %{theme_name} GNOME Shell theme -Group: User Interface/Desktops -Requires: %{name}-common = %{version}-%{release}, gnome-shell-extension-user-theme >= 3.10, google-droid-sans-fonts - -%description -n gnome-shell-theme-%{name} -%{theme_name} GNOME Shell theme. - - -%package xfwm4-theme -Summary: %{theme_name} Xfwm4 themes -Group: User Interface/Desktops -Requires: %{name}-common = %{version}-%{release}, xfwm4 - -%description xfwm4-theme -Themes for Xfwm4 as part of the %{theme_name} theme. - - %prep -%setup -q -c -n %{name}_by_%{author}-%{tag} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 +%setup -q -n %{theme_name}-%{gtk_ver}-%{version} # Remove "Thumbs.db" files find . -name Thumbs.db -type f -exec rm -f '{}' \; # Fix end-of-line encoding of "README" -sed -i 's/\r//' README +sed -i 's/\r//' README.md # Fix text encoding of "README" -iconv -f iso8859-1 -t utf-8 README > README.conv && mv -f README.conv README -# Remove Unity stuff -rm %{theme_name}/gtk-3.0/unity.css -rm -r %{theme_name}/unity/ - +iconv -f iso8859-1 -t utf-8 README.md > README.conv && mv -f README.conv README %build # Nothing to build - %install mkdir -p -m755 %{buildroot}%{_datadir}/themes/%{theme_name} cp -pr %{theme_name}/* %{buildroot}%{_datadir}/themes/%{theme_name} -mkdir -p -m755 %{buildroot}%{_datadir}/themes/%{theme_name}/gnome-shell -cp -pr %{shell_name}/gnome-shell/* %{buildroot}%{_datadir}/themes/%{theme_name}/gnome-shell - %files common -%doc COPYING README +%doc README +%license COPYING %dir %{_datadir}/themes/%{theme_name}/ %{_datadir}/themes/%{theme_name}/index.theme %files gtk2-theme %{_datadir}/themes/%{theme_name}/gtk-2.0/ - %files gtk3-theme %{_datadir}/themes/%{theme_name}/gtk-3.0/ - %files metacity-theme %{_datadir}/themes/%{theme_name}/metacity-1/ - -%files -n gnome-shell-theme-%{name} -%{_datadir}/themes/%{theme_name}/gnome-shell/ - - -%files xfwm4-theme -%{_datadir}/themes/%{theme_name}/xfwm4/ - - %changelog +* Mon Sep 07 2015 Leigh Scott - 1:0.0.1-1 +- switch to my own branch +- drop xfce support +- drop gnome-shell support + * Tue Aug 25 2015 Leigh Scott - 20141022-13 - more cinnamon-settings tweaks diff --git a/zukitwo_adjust-sidbar-in-dialog-open.patch b/zukitwo_adjust-sidbar-in-dialog-open.patch deleted file mode 100644 index 47f9683..0000000 --- a/zukitwo_adjust-sidbar-in-dialog-open.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -upr a/Zukitwo/gtk-3.0/gtk-widgets.css b/Zukitwo/gtk-3.0/gtk-widgets.css ---- a/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-13 10:01:15.899173000 +0200 -+++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-13 10:17:20.937364715 +0200 -@@ -2012,6 +2012,11 @@ GtkFileChooserButton GtkImage:last-child - color: @internal_element_color; - } - -+GtkFileChooserWidget.vertical GtkPaned.horizontal { -+ -GtkPaned-handle-size: 3px; -+ border-color: transparent; -+} -+ - /************** - * Scrollbars * - **************/ -@@ -2739,6 +2744,41 @@ GtkMessageDialog { - border-style: none; - } - -+/* dialog open */ -+.sidebar.list, -+.sidebar.list .button { -+ background-color: @sidebar_bg; -+} -+ -+.sidebar-revealer .sidebar-button.image-button.button { -+ background-color: transparent; -+ background-image: none; -+ border-image:none; -+ box-shadow: none; -+} -+ -+.sidebar.list .button { -+ padding: 4px 8px 4px 6px; -+} -+ -+.sidebar.list .button:selected { -+ border-width: 0; -+ border-style: solid; -+ border-color: shade (@theme_selected_bg_color, 0.85); -+ background-image: linear-gradient(to bottom, -+ shade (@theme_selected_bg_color, 1.0), -+ shade (@theme_selected_bg_color, 1.0)); -+ box-shadow: none; -+} -+ -+.sidebar.list .button:hover { -+ background-color: shade (@theme_bg_color, 0.95); -+} -+ -+.sidebar.list .button .sidebar-label { -+ padding: 0px 8px; -+} -+ - .sidebar row:hover { - background-color: shade (@theme_bg_color, 0.95); - } diff --git a/zukitwo_fg-color-icon-c-settings-nice.patch b/zukitwo_fg-color-icon-c-settings-nice.patch deleted file mode 100644 index a68ef64..0000000 --- a/zukitwo_fg-color-icon-c-settings-nice.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 -@@ -3596,13 +3596,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, diff --git a/zukitwo_index-theme-correction.patch b/zukitwo_index-theme-correction.patch deleted file mode 100644 index 558bb1e..0000000 --- a/zukitwo_index-theme-correction.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -upr a/Zukitwo/index.theme b/Zukitwo/index.theme ---- a/Zukitwo/index.theme 2015-08-13 10:00:58.562989000 +0200 -+++ b/Zukitwo/index.theme 2015-08-13 10:05:03.784584855 +0200 -@@ -8,3 +8,4 @@ Encoding=UTF-8 - GtkTheme=Zukitwo - MetacityTheme=Zukitwo - ButtonLayout=:minimize,maximize,close -+IconTheme=gnome diff --git a/zukitwo_no-shadow-for-list-rows.patch b/zukitwo_no-shadow-for-list-rows.patch deleted file mode 100644 index 5633cb4..0000000 --- a/zukitwo_no-shadow-for-list-rows.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -upr a/Zukitwo/gtk-3.0/gtk-widgets.css b/Zukitwo/gtk-3.0/gtk-widgets.css ---- a/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-13 10:01:15.899173000 +0200 -+++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-08-13 10:17:20.937364715 +0200 -@@ -3596,7 +3636,9 @@ row:selected:focus:backdrop { - GtkTreeView row:nth-child(even), - GtkTreeView row:nth-child(odd) { - background-color: shade (@theme_base_color, 1.0); -- box-shadow: inset 0 -1px 0 0 alpha (@theme_bg_color, 0.4); -+/* since gtk+-3.18, better no shadow */ -+/* box-shadow: inset 0 -1px 0 0 alpha (@theme_bg_color, 0.4); */ -+ box-shadow: none; - } - - GtkTreeView row:nth-child(odd):hover, From bad7eb1b4e820b7624b40af9062db3e6bd5afde7 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 10 Sep 2015 11:07:18 +0100 Subject: [PATCH 08/12] update to 0.0.2 pre-release --- .gitignore | 1 + sources | 2 +- zukitwo.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 78482a5..3578e4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /zukitwo_by_lassekongo83-d3df2ot.zip /gtk3.18-0.0.1.tar.gz +/gtk3.18-0.0.2.tar.gz diff --git a/sources b/sources index 2fe4249..0923524 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82f70f8826e3c8fd0203cf54f016e235 gtk3.18-0.0.1.tar.gz +6b43523718f58d175b8ca076cc141bec gtk3.18-0.0.2.tar.gz diff --git a/zukitwo.spec b/zukitwo.spec index e8d4a10..23c9b03 100644 --- a/zukitwo.spec +++ b/zukitwo.spec @@ -3,7 +3,7 @@ Name: zukitwo Epoch: 1 -Version: 0.0.1 +Version: 0.0.2 Release: 1%{?dist} Summary: Themes for GTK+2, GTK+3 and Metacity @@ -82,6 +82,9 @@ cp -pr %{theme_name}/* %{buildroot}%{_datadir}/themes/%{theme_name} %{_datadir}/themes/%{theme_name}/metacity-1/ %changelog +* Thu Sep 10 2015 Leigh Scott - 1:0.0.2-1 +- update to 0.0.2 pre-release + * Mon Sep 07 2015 Leigh Scott - 1:0.0.1-1 - switch to my own branch - drop xfce support From 8bc895a1ac9642a0cee17533354e1d785a137e52 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 4 Dec 2015 10:26:36 +0000 Subject: [PATCH 09/12] obsolete gnome-shell theme --- zukitwo.spec | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/zukitwo.spec b/zukitwo.spec index 4d901ea..e7c5847 100644 --- a/zukitwo.spec +++ b/zukitwo.spec @@ -6,8 +6,8 @@ Name: zukitwo Version: 20141022 -Release: 9%{?dist} -Summary: Themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4 +Release: 10%{?dist} +Summary: Themes for GTK+2, GTK+3, Metacity and Xfwm4 Group: User Interface/Desktops License: GPLv3 @@ -32,6 +32,7 @@ created by %{author}. %package common Summary: Files common to %{theme_name} themes Group: User Interface/Desktops +Obsoletes: gnome-shell-theme-%{name} %description common Files which are common to all %{theme_name} themes. @@ -64,15 +65,6 @@ Requires: %{name}-common = %{version}-%{release}, metacity Themes for Metacity as part of the %{theme_name} theme. -%package -n gnome-shell-theme-%{name} -Summary: %{theme_name} GNOME Shell theme -Group: User Interface/Desktops -Requires: %{name}-common = %{version}-%{release}, gnome-shell-extension-user-theme >= 3.10, google-droid-sans-fonts - -%description -n gnome-shell-theme-%{name} -%{theme_name} GNOME Shell theme. - - %package xfwm4-theme Summary: %{theme_name} Xfwm4 themes Group: User Interface/Desktops @@ -108,8 +100,6 @@ rm -r %{theme_name}/unity/ %install mkdir -p -m755 %{buildroot}%{_datadir}/themes/%{theme_name} cp -pr %{theme_name}/* %{buildroot}%{_datadir}/themes/%{theme_name} -mkdir -p -m755 %{buildroot}%{_datadir}/themes/%{theme_name}/gnome-shell -cp -pr %{shell_name}/gnome-shell/* %{buildroot}%{_datadir}/themes/%{theme_name}/gnome-shell %files common @@ -129,15 +119,14 @@ cp -pr %{shell_name}/gnome-shell/* %{buildroot}%{_datadir}/themes/%{theme_name}/ %{_datadir}/themes/%{theme_name}/metacity-1/ -%files -n gnome-shell-theme-%{name} -%{_datadir}/themes/%{theme_name}/gnome-shell/ - - %files xfwm4-theme %{_datadir}/themes/%{theme_name}/xfwm4/ %changelog +* Fri Dec 04 2015 Leigh Scott - 20141022-10 +- obsolete gnome-shell theme + * Wed Jul 15 2015 Leigh Scott - 20141022-9 - revert last change From d632f6dda462c2070f43ba41cbeb44e0b1f735f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 04:09:17 +0000 Subject: [PATCH 10/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- zukitwo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zukitwo.spec b/zukitwo.spec index 23c9b03..0f84096 100644 --- a/zukitwo.spec +++ b/zukitwo.spec @@ -4,7 +4,7 @@ Name: zukitwo Epoch: 1 Version: 0.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Themes for GTK+2, GTK+3 and Metacity License: GPLv3 @@ -82,6 +82,9 @@ cp -pr %{theme_name}/* %{buildroot}%{_datadir}/themes/%{theme_name} %{_datadir}/themes/%{theme_name}/metacity-1/ %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1:0.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Sep 10 2015 Leigh Scott - 1:0.0.2-1 - update to 0.0.2 pre-release From 9b48a447942161cad435dede7cab98463b71f593 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Thu, 19 May 2016 22:52:56 +0200 Subject: [PATCH 11/12] 2016-05-19: Retired orphaned package, because it was orphaned for more than six weeks. --- .gitignore | 3 - dead.package | 3 + sources | 1 - zukitwo.spec | 234 --------------------------------------------------- 4 files changed, 3 insertions(+), 238 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 zukitwo.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3578e4d..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/zukitwo_by_lassekongo83-d3df2ot.zip -/gtk3.18-0.0.1.tar.gz -/gtk3.18-0.0.2.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..164cb9a --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2016-05-19: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/sources b/sources deleted file mode 100644 index 0923524..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -6b43523718f58d175b8ca076cc141bec gtk3.18-0.0.2.tar.gz diff --git a/zukitwo.spec b/zukitwo.spec deleted file mode 100644 index 0f84096..0000000 --- a/zukitwo.spec +++ /dev/null @@ -1,234 +0,0 @@ -%global theme_name Zukitwo -%global gtk_ver gtk3.18 - -Name: zukitwo -Epoch: 1 -Version: 0.0.2 -Release: 2%{?dist} -Summary: Themes for GTK+2, GTK+3 and Metacity - -License: GPLv3 -URL: https://github.com/leigh123linux/Zukitwo -Source0: https://github.com/leigh123linux/Zukitwo/archive/%{gtk_ver}-%{version}.tar.gz - -BuildArch: noarch - -%description -The %{theme_name} themes for GTK+2, GTK+3 and Metacity. - -%package common -Summary: Files common to %{theme_name} themes -Group: User Interface/Desktops -Obsoletes: gnome-shell-theme-zukitwo -Obsoletes: zukitwo-xfwm4-theme - -%description common -Files which are common to all %{theme_name} themes. - -%package gtk2-theme -Summary: %{theme_name} GTK+2 themes -Group: User Interface/Desktops -Requires: %{name}-common = %{?epoch}:%{version}-%{release}, gtk-murrine-engine >= 0.98.1.1, gtk2-engines - -%description gtk2-theme -Themes for GTK+2 as part of the %{theme_name} theme. - -%package gtk3-theme -Summary: %{theme_name} GTK+3 themes -Group: User Interface/Desktops -Requires: %{name}-common = %{?epoch}:%{version}-%{release} - -%description gtk3-theme -Themes for GTK+3 as part of the %{theme_name} theme. - -%package metacity-theme -Summary: %{theme_name} Metacity themes -Group: User Interface/Desktops -Requires: %{name}-common = %{?epoch}:%{version}-%{release}, metacity - -%description metacity-theme -Themes for Metacity as part of the %{theme_name} theme. - -%prep -%setup -q -n %{theme_name}-%{gtk_ver}-%{version} - -# Remove "Thumbs.db" files -find . -name Thumbs.db -type f -exec rm -f '{}' \; -# Fix end-of-line encoding of "README" -sed -i 's/\r//' README.md -# Fix text encoding of "README" -iconv -f iso8859-1 -t utf-8 README.md > README.conv && mv -f README.conv README - -%build -# Nothing to build - -%install -mkdir -p -m755 %{buildroot}%{_datadir}/themes/%{theme_name} -cp -pr %{theme_name}/* %{buildroot}%{_datadir}/themes/%{theme_name} - -%files common -%doc README -%license COPYING -%dir %{_datadir}/themes/%{theme_name}/ -%{_datadir}/themes/%{theme_name}/index.theme - -%files gtk2-theme -%{_datadir}/themes/%{theme_name}/gtk-2.0/ - -%files gtk3-theme -%{_datadir}/themes/%{theme_name}/gtk-3.0/ - -%files metacity-theme -%{_datadir}/themes/%{theme_name}/metacity-1/ - -%changelog -* Fri Feb 05 2016 Fedora Release Engineering - 1:0.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Sep 10 2015 Leigh Scott - 1:0.0.2-1 -- update to 0.0.2 pre-release - -* Mon Sep 07 2015 Leigh Scott - 1:0.0.1-1 -- switch to my own branch -- drop xfce support -- drop gnome-shell support - -* Tue Aug 25 2015 Leigh Scott - 20141022-13 -- more cinnamon-settings tweaks - -* Tue Aug 25 2015 Leigh Scott - 20141022-12 -- add cinnamon-settings tweaks - -* Tue Aug 25 2015 Leigh Scott - 20141022-11 -- fix GtkComboBox font color - -* Mon Aug 24 2015 Leigh Scott - 20141022-10 -- add raveit65 theme fixes for gtk-3.18 - -* Wed Jul 15 2015 Leigh Scott - 20141022-9 -- revert last change - -* Wed Jul 15 2015 Leigh Scott - 20141022-8 -- more scrollbar tweaks - -* Wed Jul 15 2015 Leigh Scott - 20141022-7 -- readd scrollbar stepper - -* Sat Jul 04 2015 Leigh Scott - 20141022-6 -- add patch to make overshoot look good - -* Fri Jun 19 2015 Fedora Release Engineering - 20141022-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu May 14 2015 Leigh Scott - 20141022-4 -- readd index.theme - -* Thu May 14 2015 Leigh Scott - 20141022-3 -- fix sidebar - -* Thu Apr 02 2015 Leigh Scott - 20141022-2 -- fix firefox tooltip - -* Wed Jan 21 2015 Leigh Scott - 20141022-1 -- Update to latest upstream version - -* Sat Jun 07 2014 Fedora Release Engineering - 20131210-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Dec 14 2013 Mattia Meneguzzo - 20131210-1 -- Update to latest upstream version - -* Sun Nov 24 2013 Mattia Meneguzzo - 20131107-1 -- Update to latest upstream version - -* Wed Oct 16 2013 Mattia Meneguzzo - 20131012-1 -- Update to latest upstream version (compatible with Gnome >= 3.10) - -* Sun Aug 04 2013 Fedora Release Engineering - 20130424-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat May 11 2013 Mattia Meneguzzo - 20130424-1 -- Update to latest upstream version - -* Fri Apr 19 2013 Mattia Meneguzzo - 20130418-1 -- Update to latest upstream version - -* Sat Apr 13 2013 Mattia Meneguzzo - 20130329-1 -- Update to latest upstream version (compatible with Gnome >= 3.8) - -* Sat Feb 16 2013 Mattia Meneguzzo - 20130207-1 -- Update to latest upstream version - -* Fri Feb 15 2013 Fedora Release Engineering - 20121216-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jan 13 2013 Mattia Meneguzzo - 20121216-2 -- Correct Spec file - -* Sun Jan 13 2013 Mattia Meneguzzo - 20121216-1 -- Update to latest upstream version - -* Thu Dec 13 2012 Mattia Meneguzzo - 20121211-1 -- Update to latest upstream version -- Change font package required by gnome-shell-theme-zukitwo from liberation-sans-fonts to google-droid-sans-fonts - -* Sat Dec 08 2012 Mattia Meneguzzo - 20121207-1 -- Update to latest upstream version -- Remove everything related to "Zukitwo-Dark" -- Remove fields "Provides" and "Obsoletes" -- Update requirements - -* Tue Nov 20 2012 Mattia Meneguzzo - 20120817-3 -- Add fields "Provides" and "Obsoletes" to the "common" subpackage - -* Sun Nov 04 2012 Mattia Meneguzzo - 20120817-2 -- Package the GNOME Shell theme only for Fedora up to 17 - -* Fri Aug 17 2012 Mattia Meneguzzo - 20120817-1 -- Update to latest upstream version - -* Sun Aug 05 2012 Mattia Meneguzzo - 20120708-5 -- Correct an error in .spec file - -* Sat Aug 04 2012 Mattia Meneguzzo - 20120708-4 -- Replace a copy of the directory containing the Gnome Shell theme with a symbolic link to the other - -* Sat Aug 04 2012 Mattia Meneguzzo - 20120708-3 -- Add a "common" subpackage which owns files and directories that are common to all themes -- Change directory structure - -* Sun Jul 22 2012 Fedora Release Engineering - 20120708-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Jul 15 2012 Mattia Meneguzzo - 20120708-1 -- Update to latest upstream version - -* Sat Jul 07 2012 Mattia Meneguzzo - 20120702-1 -- Update to latest upstream version - -* Mon Jun 18 2012 Mattia Meneguzzo - 20120612-1 -- Update to latest upstream version - -* Sat Jun 09 2012 Mattia Meneguzzo - 20120607-1 -- Update to latest upstream version -- Add a patch to remove "Ubuntu" and "Trebuchet MS" from "font-family" in gnome-shell.css and two references to Unity-related stuff. - -* Tue Jun 05 2012 Mattia Meneguzzo - 20120602-2 -- Add google-droid-sans-fonts as a requirement for gnome-shell-theme-zukitwo -- Add a patch to remove "Ubuntu" from "font-family" in gnome-shell.css - -* Sun Jun 03 2012 Mattia Meneguzzo - 20120602-1 -- Update to latest upstream version -- Change "License" from "GPLv3+" to "GPLv3" in Spec file - -* Sat May 26 2012 Mattia Meneguzzo - 20120526-1 -- Update to latest upstream version - -* Fri May 25 2012 Mattia Meneguzzo - 20120523-1 -- Update to latest upstream version - -* Sat May 19 2012 Mattia Meneguzzo - 20120516-1 -- Update to latest upstream version - -* Sat May 12 2012 Mattia Meneguzzo - 20120511-1 -- Initial package for Fedora (thanks to Tim Lauridsen and Mohamed El Morabity for their precious help) From a94058e9335063c16063b32f67ea424267bd8c81 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Fri, 17 Feb 2017 21:30:38 +0100 Subject: [PATCH 12/12] 2017-02-17: Retired orphaned package, because it was orphaned for more than six weeks. --- .gitignore | 1 - dead.package | 3 + firefox_tooltip.patch | 12 -- make-overshoot-look-good.patch | 209 --------------------------- readd_scrollbar_stepper.patch | 12 -- sidebar_fix.patch | 22 --- sources | 1 - zukitwo-rm_unity.patch | 8 -- zukitwo.spec | 256 --------------------------------- 9 files changed, 3 insertions(+), 521 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 firefox_tooltip.patch delete mode 100644 make-overshoot-look-good.patch delete mode 100644 readd_scrollbar_stepper.patch delete mode 100644 sidebar_fix.patch delete mode 100644 sources delete mode 100644 zukitwo-rm_unity.patch delete mode 100644 zukitwo.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 67abf0c..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/zukitwo_by_lassekongo83-d3df2ot.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..1eda3ff --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2017-02-17: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/firefox_tooltip.patch b/firefox_tooltip.patch deleted file mode 100644 index 3b354ba..0000000 --- a/firefox_tooltip.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Zukitwo/gtk-3.0/gtk-widgets.css 2014-10-22 09:04:18.000000000 +0100 -+++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-04-01 13:52:00.725895000 +0100 -@@ -134,7 +134,8 @@ GtkTextView { - /************ - * Tooltips * - ************/ --.tooltip { -+.tooltip, -+.tooltip.background { - padding: 4px; - border-style: solid; - border-width: 1px; diff --git a/make-overshoot-look-good.patch b/make-overshoot-look-good.patch deleted file mode 100644 index 40b43cc..0000000 --- a/make-overshoot-look-good.patch +++ /dev/null @@ -1,209 +0,0 @@ -From 0b8043ccdcfd689820d2bc492e1880f1d17a99f0 Mon Sep 17 00:00:00 2001 -From: leigh123linux -Date: Fri, 3 Jul 2015 17:06:30 +0100 -Subject: [PATCH] make overshoot look good - ---- - Zukitwo/gtk-3.0/gtk-widgets.css | 184 +++++++++++++++++++++++++++++++++++++++- - 1 file changed, 181 insertions(+), 3 deletions(-) - -diff --git a/Zukitwo/gtk-3.0/gtk-widgets.css b/Zukitwo/gtk-3.0/gtk-widgets.css -index cc44908..2ae3ede 100644 ---- a/Zukitwo/gtk-3.0/gtk-widgets.css -+++ b/Zukitwo/gtk-3.0/gtk-widgets.css -@@ -183,11 +183,189 @@ GtkTextView { - border-radius: 0px; - } - --.overshoot, --.sidebar.overshoot { -- background-color: alpha (@theme_selected_bg_color, 0.35); -+/************************ -+ * overshoot/undershoot * -+ ************************/ -+ -+/* displays at end of mouse scrolling */ -+.overshoot.top { -+ background-image: -gtk-gradient(radial, -+ center top, 0, -+ center top, 0.5, -+ to(@overshoot_bg_color), -+ to(rgba(137, 158, 179, 0))), -+ -gtk-gradient(radial, -+ center top, 0, -+ center top, 0.6, -+ from(rgba(56, 73, 87, 0.17)), -+ to(rgba(56, 73, 87, 0))); -+ background-size: 100% 5%, 100% 100%; -+ background-repeat: no-repeat; -+ background-position: center top; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.top:backdrop { -+ background-image: -gtk-gradient(radial, -+ center top, 0, -+ center top, 0.5, -+ to(@overshoot_backdrop_bg_color), -+ to(rgba(131, 137, 145, 0))); -+ background-size: 100% 5%; -+ background-repeat: no-repeat; -+ background-position: center top; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.bottom { -+ background-image: -gtk-gradient(radial, -+ center bottom, 0, -+ center bottom, 0.5, -+ to(@overshoot_bg_color), -+ to(rgba(137, 158, 179, 0))), -+ -gtk-gradient(radial, -+ center bottom, 0, -+ center bottom, 0.6, -+ from(rgba(56, 73, 87, 0.17)), -+ to(rgba(56, 73, 87, 0))); -+ background-size: 100% 5%, 100% 100%; -+ background-repeat: no-repeat; -+ background-position: center bottom; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.bottom:backdrop { -+ background-image: -gtk-gradient(radial, -+ center bottom, 0, -+ center bottom, 0.5, -+ to(@overshoot_backdrop_bg_color), -+ to(rgba(131, 137, 145, 0))); -+ background-size: 100% 5%; -+ background-repeat: no-repeat; -+ background-position: center bottom; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.left { -+ background-image: -gtk-gradient(radial, -+ left center, 0, -+ left center, 0.5, -+ to(@overshoot_bg_color), -+ to(rgba(137, 158, 179, 0))), -+ -gtk-gradient(radial, -+ left center, 0, -+ left center, 0.6, -+ from(rgba(56, 73, 87, 0.07)), -+ to(rgba(56, 73, 87, 0))); -+ background-size: 5% 100%, 100% 100%; -+ background-repeat: no-repeat; -+ background-position: left center; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.left:backdrop { -+ background-image: -gtk-gradient(radial, -+ left center, 0, -+ left center, 0.5, -+ to(@overshoot_backdrop_bg_color), -+ to(rgba(131, 137, 145, 0))); -+ background-size: 5% 100%; -+ background-repeat: no-repeat; -+ background-position: left center; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.right { -+ background-image: -gtk-gradient(radial, -+ right center, 0, -+ right center, 0.5, -+ to(@overshoot_bg_color), -+ to(rgba(137, 158, 179, 0))), -+ -gtk-gradient(radial, -+ right center, 0, -+ right center, 0.6, -+ from(rgba(56, 73, 87, 0.07)), -+ to(rgba(56, 73, 87, 0))); -+ background-size: 5% 100%, 100% 100%; -+ background-repeat: no-repeat; -+ background-position: right center; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+.overshoot.right:backdrop { -+ background-image: -gtk-gradient(radial, -+ right center, 0, -+ right center, 0.5, -+ to(@overshoot_backdrop_bg_color), -+ to(rgba(131, 137, 145, 0))); -+ background-size: 5% 100%; -+ background-repeat: no-repeat; -+ background-position: right center; -+ background-color: transparent; -+ border: none; -+ box-shadow: none; -+} -+ -+/* result is disable undershoot */ -+.undershoot.top { -+ background-color: transparent; -+ background-image: linear-gradient(to left, -+ rgba(255, 255, 255, 0.2) 50%, -+ rgba(0, 0, 0, 0.2) 50%); -+ background-size: 10px 0px; -+ background-repeat: repeat-x; -+ background-origin: content-box; -+ background-position: center top; -+} -+ -+.undershoot.bottom { -+ background-color: transparent; -+ background-image: linear-gradient(to left, -+ rgba(255, 255, 255, 0.2) 50%, -+ rgba(0, 0, 0, 0.2) 50%); -+ background-size: 10px 0px; -+ background-repeat: repeat-x; -+ background-origin: content-box; -+ background-position: center bottom; -+} -+ -+.undershoot.left { -+ background-color: transparent; -+ background-image: linear-gradient(to top, -+ rgba(255, 255, 255, 0.2) 50%, -+ rgba(0, 0, 0, 0.2) 50%); -+ background-size: 0px 10px; -+ background-repeat: repeat-y; -+ background-origin: content-box; -+ background-position: left center; -+} -+ -+.undershoot.right { -+ background-color: transparent; -+ background-image: linear-gradient(to top, -+ rgba(255, 255, 255, 0.2) 50%, -+ rgba(0, 0, 0, 0.2) 50%); -+ background-size: 0px 10px; -+ background-repeat: repeat-y; -+ background-origin: content-box; -+ background-position: right center; - } - -+ - GtkStatusbar { - padding: 5px; - color: @theme_fg_color; --- -2.4.3 - diff --git a/readd_scrollbar_stepper.patch b/readd_scrollbar_stepper.patch deleted file mode 100644 index 4c98a8b..0000000 --- a/readd_scrollbar_stepper.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Zukitwo/gtk-3.0/gtk-widgets.css 2015-07-04 06:00:02.000000000 +0100 -+++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-07-15 15:42:18.862738729 +0100 -@@ -2020,8 +2020,8 @@ GtkFileChooserButton GtkImage:last-child - background-image: none; - border-style: solid; - -GtkRange-trough-border: 0; -- -GtkScrollbar-has-backward-stepper: false; -- -GtkScrollbar-has-forward-stepper: false; -+ -GtkScrollbar-has-backward-stepper: true; -+ -GtkScrollbar-has-forward-stepper: true; - -GtkRange-slider-width: 13; - -GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */ diff --git a/sidebar_fix.patch b/sidebar_fix.patch deleted file mode 100644 index f66737b..0000000 --- a/sidebar_fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Zukitwo/gtk-3.0/gtk-widgets.css 2015-04-07 13:54:37.432443000 +0100 -+++ b/Zukitwo/gtk-3.0/gtk-widgets.css 2015-04-07 13:57:10.805998436 +0100 -@@ -183,7 +183,8 @@ GtkTextView { - border-radius: 0px; - } - --.overshoot { -+.overshoot, -+.sidebar.overshoot { - background-color: alpha (@theme_selected_bg_color, 0.35); - } - -@@ -2552,8 +2553,7 @@ GtkMessageDialog { - * Sidebar * - ***********/ - .sidebar, --.sidebar .view, --.sidebar GtkScrolledWindow { -+.sidebar .view { - background-color: @sidebar_bg; - } - diff --git a/sources b/sources deleted file mode 100644 index f9d2a81..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -1e573dbe63407aaa607d2d1e8e11839b zukitwo_by_lassekongo83-d3df2ot.zip diff --git a/zukitwo-rm_unity.patch b/zukitwo-rm_unity.patch deleted file mode 100644 index b881a65..0000000 --- a/zukitwo-rm_unity.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/Zukitwo/gtk-3.0/gtk-main.css 2014-10-17 09:49:30.000000000 +0100 -+++ b/Zukitwo/gtk-3.0/gtk-main.css 2015-01-21 18:47:32.164666791 +0000 -@@ -219,5 +219,4 @@ - @import url("gtk-widgets.css"); - /*@import url("gnome-applications.css");*/ - @import url("other-applications.css"); --@import url("unity.css"); - @import url("window-controls.css"); diff --git a/zukitwo.spec b/zukitwo.spec deleted file mode 100644 index e7c5847..0000000 --- a/zukitwo.spec +++ /dev/null @@ -1,256 +0,0 @@ -%global theme_name Zukitwo -%global shell_name ZukiShell -%global deviantart_id 203936861 -%global author lassekongo83 -%global tag d3df2ot - -Name: zukitwo -Version: 20141022 -Release: 10%{?dist} -Summary: Themes for GTK+2, GTK+3, Metacity and Xfwm4 -Group: User Interface/Desktops - -License: GPLv3 -URL: http://%{author}.deviantart.com/art/%{theme_name}-%{deviantart_id} -Source0: http://www.deviantart.com/download/%{deviantart_id}/%{name}_by_%{author}-%{tag}.zip - -# This patch removes two references to Unity-related stuff from -# Zukitwo/gtk-3.0/gtk.css -Patch0: %{name}-rm_unity.patch -Patch1: firefox_tooltip.patch -Patch2: sidebar_fix.patch -Patch3: make-overshoot-look-good.patch -Patch4: readd_scrollbar_stepper.patch - -BuildArch: noarch - -%description -The %{theme_name} themes for GTK+2, GTK+3, Metacity, GNOME Shell and Xfwm4, -created by %{author}. - - -%package common -Summary: Files common to %{theme_name} themes -Group: User Interface/Desktops -Obsoletes: gnome-shell-theme-%{name} - -%description common -Files which are common to all %{theme_name} themes. - - -%package gtk2-theme -Summary: %{theme_name} GTK+2 themes -Group: User Interface/Desktops -Requires: %{name}-common = %{version}-%{release}, gtk-murrine-engine >= 0.98.1.1, gtk2-engines - -%description gtk2-theme -Themes for GTK+2 as part of the %{theme_name} theme. - - -%package gtk3-theme -Summary: %{theme_name} GTK+3 themes -Group: User Interface/Desktops -Requires: %{name}-common = %{version}-%{release} - -%description gtk3-theme -Themes for GTK+3 as part of the %{theme_name} theme. - - -%package metacity-theme -Summary: %{theme_name} Metacity themes -Group: User Interface/Desktops -Requires: %{name}-common = %{version}-%{release}, metacity - -%description metacity-theme -Themes for Metacity as part of the %{theme_name} theme. - - -%package xfwm4-theme -Summary: %{theme_name} Xfwm4 themes -Group: User Interface/Desktops -Requires: %{name}-common = %{version}-%{release}, xfwm4 - -%description xfwm4-theme -Themes for Xfwm4 as part of the %{theme_name} theme. - - -%prep -%setup -q -c -n %{name}_by_%{author}-%{tag} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 - -# Remove "Thumbs.db" files -find . -name Thumbs.db -type f -exec rm -f '{}' \; -# Fix end-of-line encoding of "README" -sed -i 's/\r//' README -# Fix text encoding of "README" -iconv -f iso8859-1 -t utf-8 README > README.conv && mv -f README.conv README -# Remove Unity stuff -rm %{theme_name}/gtk-3.0/unity.css -rm -r %{theme_name}/unity/ - - -%build -# Nothing to build - - -%install -mkdir -p -m755 %{buildroot}%{_datadir}/themes/%{theme_name} -cp -pr %{theme_name}/* %{buildroot}%{_datadir}/themes/%{theme_name} - - -%files common -%doc COPYING README -%dir %{_datadir}/themes/%{theme_name}/ -%{_datadir}/themes/%{theme_name}/index.theme - -%files gtk2-theme -%{_datadir}/themes/%{theme_name}/gtk-2.0/ - - -%files gtk3-theme -%{_datadir}/themes/%{theme_name}/gtk-3.0/ - - -%files metacity-theme -%{_datadir}/themes/%{theme_name}/metacity-1/ - - -%files xfwm4-theme -%{_datadir}/themes/%{theme_name}/xfwm4/ - - -%changelog -* Fri Dec 04 2015 Leigh Scott - 20141022-10 -- obsolete gnome-shell theme - -* Wed Jul 15 2015 Leigh Scott - 20141022-9 -- revert last change - -* Wed Jul 15 2015 Leigh Scott - 20141022-8 -- more scrollbar tweaks - -* Wed Jul 15 2015 Leigh Scott - 20141022-7 -- readd scrollbar stepper - -* Sat Jul 04 2015 Leigh Scott - 20141022-6 -- add patch to make overshoot look good - -* Fri Jun 19 2015 Fedora Release Engineering - 20141022-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu May 14 2015 Leigh Scott - 20141022-4 -- readd index.theme - -* Thu May 14 2015 Leigh Scott - 20141022-3 -- fix sidebar - -* Thu Apr 02 2015 Leigh Scott - 20141022-2 -- fix firefox tooltip - -* Wed Jan 21 2015 Leigh Scott - 20141022-1 -- Update to latest upstream version - -* Sat Jun 07 2014 Fedora Release Engineering - 20131210-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Dec 14 2013 Mattia Meneguzzo - 20131210-1 -- Update to latest upstream version - -* Sun Nov 24 2013 Mattia Meneguzzo - 20131107-1 -- Update to latest upstream version - -* Wed Oct 16 2013 Mattia Meneguzzo - 20131012-1 -- Update to latest upstream version (compatible with Gnome >= 3.10) - -* Sun Aug 04 2013 Fedora Release Engineering - 20130424-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat May 11 2013 Mattia Meneguzzo - 20130424-1 -- Update to latest upstream version - -* Fri Apr 19 2013 Mattia Meneguzzo - 20130418-1 -- Update to latest upstream version - -* Sat Apr 13 2013 Mattia Meneguzzo - 20130329-1 -- Update to latest upstream version (compatible with Gnome >= 3.8) - -* Sat Feb 16 2013 Mattia Meneguzzo - 20130207-1 -- Update to latest upstream version - -* Fri Feb 15 2013 Fedora Release Engineering - 20121216-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jan 13 2013 Mattia Meneguzzo - 20121216-2 -- Correct Spec file - -* Sun Jan 13 2013 Mattia Meneguzzo - 20121216-1 -- Update to latest upstream version - -* Thu Dec 13 2012 Mattia Meneguzzo - 20121211-1 -- Update to latest upstream version -- Change font package required by gnome-shell-theme-zukitwo from liberation-sans-fonts to google-droid-sans-fonts - -* Sat Dec 08 2012 Mattia Meneguzzo - 20121207-1 -- Update to latest upstream version -- Remove everything related to "Zukitwo-Dark" -- Remove fields "Provides" and "Obsoletes" -- Update requirements - -* Tue Nov 20 2012 Mattia Meneguzzo - 20120817-3 -- Add fields "Provides" and "Obsoletes" to the "common" subpackage - -* Sun Nov 04 2012 Mattia Meneguzzo - 20120817-2 -- Package the GNOME Shell theme only for Fedora up to 17 - -* Fri Aug 17 2012 Mattia Meneguzzo - 20120817-1 -- Update to latest upstream version - -* Sun Aug 05 2012 Mattia Meneguzzo - 20120708-5 -- Correct an error in .spec file - -* Sat Aug 04 2012 Mattia Meneguzzo - 20120708-4 -- Replace a copy of the directory containing the Gnome Shell theme with a symbolic link to the other - -* Sat Aug 04 2012 Mattia Meneguzzo - 20120708-3 -- Add a "common" subpackage which owns files and directories that are common to all themes -- Change directory structure - -* Sun Jul 22 2012 Fedora Release Engineering - 20120708-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Jul 15 2012 Mattia Meneguzzo - 20120708-1 -- Update to latest upstream version - -* Sat Jul 07 2012 Mattia Meneguzzo - 20120702-1 -- Update to latest upstream version - -* Mon Jun 18 2012 Mattia Meneguzzo - 20120612-1 -- Update to latest upstream version - -* Sat Jun 09 2012 Mattia Meneguzzo - 20120607-1 -- Update to latest upstream version -- Add a patch to remove "Ubuntu" and "Trebuchet MS" from "font-family" in gnome-shell.css and two references to Unity-related stuff. - -* Tue Jun 05 2012 Mattia Meneguzzo - 20120602-2 -- Add google-droid-sans-fonts as a requirement for gnome-shell-theme-zukitwo -- Add a patch to remove "Ubuntu" from "font-family" in gnome-shell.css - -* Sun Jun 03 2012 Mattia Meneguzzo - 20120602-1 -- Update to latest upstream version -- Change "License" from "GPLv3+" to "GPLv3" in Spec file - -* Sat May 26 2012 Mattia Meneguzzo - 20120526-1 -- Update to latest upstream version - -* Fri May 25 2012 Mattia Meneguzzo - 20120523-1 -- Update to latest upstream version - -* Sat May 19 2012 Mattia Meneguzzo - 20120516-1 -- Update to latest upstream version - -* Sat May 12 2012 Mattia Meneguzzo - 20120511-1 -- Initial package for Fedora (thanks to Tim Lauridsen and Mohamed El Morabity for their precious help)