From 503cdc492e0a136e8e0b22cf727498a3a947ebff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:58:54 +0000 Subject: [PATCH 01/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adapta-gtk-theme.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adapta-gtk-theme.spec b/adapta-gtk-theme.spec index 20f6eba..638e7a0 100644 --- a/adapta-gtk-theme.spec +++ b/adapta-gtk-theme.spec @@ -1,6 +1,6 @@ Name: adapta-gtk-theme Version: 3.93.1.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An adaptive Gtk+ theme based on Material Design Guidelines License: GPLv2 and CC-BY-SA @@ -111,6 +111,9 @@ done %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 3.93.1.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon May 14 2018 Björn Esser - 3.93.1.16-1 - New upstream release (#1577681) From abf59f3bf398c2ca4ccf04de5a20b2a9ed27916b Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 28 Aug 2018 09:52:35 +0100 Subject: [PATCH 02/10] New upstream release --- adapta-gtk-theme.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/adapta-gtk-theme.spec b/adapta-gtk-theme.spec index 638e7a0..c8746d4 100644 --- a/adapta-gtk-theme.spec +++ b/adapta-gtk-theme.spec @@ -1,6 +1,6 @@ Name: adapta-gtk-theme -Version: 3.93.1.16 -Release: 2%{?dist} +Version: 3.94.0.132 +Release: 1%{?dist} Summary: An adaptive Gtk+ theme based on Material Design Guidelines License: GPLv2 and CC-BY-SA @@ -17,6 +17,7 @@ BuildRequires: parallel BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: procps-ng BuildRequires: sassc >= 3.3 Requires: gnome-themes-standard @@ -111,6 +112,9 @@ done %changelog +* Tue Aug 28 2018 Leigh Scott - 3.94.0.132-1 +- New upstream release + * Thu Jul 12 2018 Fedora Release Engineering - 3.93.1.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 8c44456..14f4d86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (adapta-gtk-theme-3.93.1.16.tar.gz) = 2e98edb376a485fbaa10d853ef0682fd510b4a6992f60704fe0e0f5661ac1d871e9fd6cf9b9b1ada3d4029bca3eed570aae7522466df23d6a57409fd25cfce59 +SHA512 (adapta-gtk-theme-3.94.0.132.tar.gz) = c77d4129ff3d0b90ff97edca37e5e2bfa7d62daa27e70a01255c2e78c10545032687deff5f5eb4c764af487c7fd46b8495512974c9484c790baaece917dc8223 From 8fa1d96efeabb0df7e845ef161b86f6911512699 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 8 Sep 2018 12:35:32 +0200 Subject: [PATCH 03/10] update to version 3.94.0.149 --- adapta-gtk-theme.spec | 22 +++++++++++++--------- sources | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/adapta-gtk-theme.spec b/adapta-gtk-theme.spec index c8746d4..a6e2b2b 100644 --- a/adapta-gtk-theme.spec +++ b/adapta-gtk-theme.spec @@ -1,11 +1,11 @@ Name: adapta-gtk-theme -Version: 3.94.0.132 -Release: 1%{?dist} Summary: An adaptive Gtk+ theme based on Material Design Guidelines - +Version: 3.94.0.149 +Release: 1%{?dist} License: GPLv2 and CC-BY-SA + URL: https://github.com/adapta-project/%{name} -Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch @@ -69,7 +69,8 @@ Plank dock theme addon for %{name}. --disable-silent-rules \ --enable-gtk_next \ --enable-plank \ - --enable-telegram + --enable-telegram \ + --enable-parallel %make_build @@ -80,13 +81,13 @@ for f in COPYING LICENSE_CC_BY_SA4 README.md; do done # Add the gedit styles addon to the right location. -%{__mkdir} -p %{buildroot}%{_datadir}/gtksourceview-3.0/styles -%{__ln_s} %{_datadir}/themes/Adapta/gedit/adapta.xml \ +mkdir -p %{buildroot}%{_datadir}/gtksourceview-3.0/styles +ln -s %{_datadir}/themes/Adapta/gedit/adapta.xml \ %{buildroot}%{_datadir}/gtksourceview-3.0/styles/adapta.xml # Add the plank addon to the right location. -%{__mkdir} -p %{buildroot}%{_datadir}/plank/themes/Adapta -%{__ln_s} %{_datadir}/themes/Adapta/plank/dock.theme \ +mkdir -p %{buildroot}%{_datadir}/plank/themes/Adapta +ln -s %{_datadir}/themes/Adapta/plank/dock.theme \ %{buildroot}%{_datadir}/plank/themes/Adapta/dock.theme %fdupes -s %{buildroot}%{_datadir}/themes @@ -112,6 +113,9 @@ done %changelog +* Fri Sep 07 2018 Fabio Valentini - 3.94.0.149-1 +- Update to version 3.94.0.149. + * Tue Aug 28 2018 Leigh Scott - 3.94.0.132-1 - New upstream release diff --git a/sources b/sources index 14f4d86..b4b8f3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (adapta-gtk-theme-3.94.0.132.tar.gz) = c77d4129ff3d0b90ff97edca37e5e2bfa7d62daa27e70a01255c2e78c10545032687deff5f5eb4c764af487c7fd46b8495512974c9484c790baaece917dc8223 +SHA512 (adapta-gtk-theme-3.94.0.149.tar.gz) = bc547ce8863850e7229ee6586ba2c11aae61d10cb5160699288ca5b8d2b130aef70b84aaf026f4050ae4850fea7f7d8bd0e2de0607d536f58f20b16adef74b85 From 12803686a3f1baba912b951e932c1be8f5f774d0 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 8 Sep 2018 12:43:21 +0200 Subject: [PATCH 04/10] update to version 3.94.0.149 --- adapta-gtk-theme.spec | 23 ++++++++++++++--------- sources | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/adapta-gtk-theme.spec b/adapta-gtk-theme.spec index 20f6eba..7695b16 100644 --- a/adapta-gtk-theme.spec +++ b/adapta-gtk-theme.spec @@ -1,11 +1,11 @@ Name: adapta-gtk-theme -Version: 3.93.1.16 -Release: 1%{?dist} Summary: An adaptive Gtk+ theme based on Material Design Guidelines - +Version: 3.94.0.149 +Release: 1%{?dist} License: GPLv2 and CC-BY-SA + URL: https://github.com/adapta-project/%{name} -Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch @@ -17,6 +17,7 @@ BuildRequires: parallel BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: procps-ng BuildRequires: sassc >= 3.3 Requires: gnome-themes-standard @@ -68,7 +69,8 @@ Plank dock theme addon for %{name}. --disable-silent-rules \ --enable-gtk_next \ --enable-plank \ - --enable-telegram + --enable-telegram \ + --enable-parallel %make_build @@ -79,13 +81,13 @@ for f in COPYING LICENSE_CC_BY_SA4 README.md; do done # Add the gedit styles addon to the right location. -%{__mkdir} -p %{buildroot}%{_datadir}/gtksourceview-3.0/styles -%{__ln_s} %{_datadir}/themes/Adapta/gedit/adapta.xml \ +mkdir -p %{buildroot}%{_datadir}/gtksourceview-3.0/styles +ln -s %{_datadir}/themes/Adapta/gedit/adapta.xml \ %{buildroot}%{_datadir}/gtksourceview-3.0/styles/adapta.xml # Add the plank addon to the right location. -%{__mkdir} -p %{buildroot}%{_datadir}/plank/themes/Adapta -%{__ln_s} %{_datadir}/themes/Adapta/plank/dock.theme \ +mkdir -p %{buildroot}%{_datadir}/plank/themes/Adapta +ln -s %{_datadir}/themes/Adapta/plank/dock.theme \ %{buildroot}%{_datadir}/plank/themes/Adapta/dock.theme %fdupes -s %{buildroot}%{_datadir}/themes @@ -111,6 +113,9 @@ done %changelog +* Fri Sep 07 2018 Fabio Valentini - 3.94.0.149-1 +- Update to version 3.94.0.149. + * Mon May 14 2018 Björn Esser - 3.93.1.16-1 - New upstream release (#1577681) diff --git a/sources b/sources index 8c44456..b4b8f3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (adapta-gtk-theme-3.93.1.16.tar.gz) = 2e98edb376a485fbaa10d853ef0682fd510b4a6992f60704fe0e0f5661ac1d871e9fd6cf9b9b1ada3d4029bca3eed570aae7522466df23d6a57409fd25cfce59 +SHA512 (adapta-gtk-theme-3.94.0.149.tar.gz) = bc547ce8863850e7229ee6586ba2c11aae61d10cb5160699288ca5b8d2b130aef70b84aaf026f4050ae4850fea7f7d8bd0e2de0607d536f58f20b16adef74b85 From 5dd60dc6098f60a3841df268801208bc88b31e01 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 26 Jan 2019 11:54:07 +0000 Subject: [PATCH 05/10] Update to version 3.95.0.11 --- adapta-gtk-theme.spec | 10 +- cinnamon4_update.patch | 349 +++++++++++++++++++++++++++++++++++++++++ sources | 2 +- 3 files changed, 358 insertions(+), 3 deletions(-) create mode 100644 cinnamon4_update.patch diff --git a/adapta-gtk-theme.spec b/adapta-gtk-theme.spec index a6e2b2b..cc76671 100644 --- a/adapta-gtk-theme.spec +++ b/adapta-gtk-theme.spec @@ -1,11 +1,13 @@ Name: adapta-gtk-theme Summary: An adaptive Gtk+ theme based on Material Design Guidelines -Version: 3.94.0.149 +Version: 3.95.0.11 Release: 1%{?dist} License: GPLv2 and CC-BY-SA URL: https://github.com/adapta-project/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# Upstream pull request for cinnamon-4 support +Patch0: %{url}/pull/745.patch#/cinnamon4_update.patch BuildArch: noarch @@ -60,7 +62,7 @@ Plank dock theme addon for %{name}. %prep -%autosetup +%autosetup -p1 %{_bindir}/autoreconf -fiv @@ -113,6 +115,10 @@ ln -s %{_datadir}/themes/Adapta/plank/dock.theme \ %changelog +* Sat Jan 26 2019 Leigh Scott - 3.95.0.11-1 +- Update to version 3.95.0.11 +- Add cinnamon-4 theme updates + * Fri Sep 07 2018 Fabio Valentini - 3.94.0.149-1 - Update to version 3.94.0.149. diff --git a/cinnamon4_update.patch b/cinnamon4_update.patch new file mode 100644 index 0000000..5bb17ba --- /dev/null +++ b/cinnamon4_update.patch @@ -0,0 +1,349 @@ +From 3ac96e3f2e4e8b2cc6095e0ffd47f5f4eb139efa Mon Sep 17 00:00:00 2001 +From: smurphos <29017677+smurphos@users.noreply.github.com> +Date: Sat, 17 Nov 2018 09:02:53 +0000 +Subject: [PATCH 1/6] Cinnanmon 4 - overview styling + +--- + shell/sass/cinnamon/_common.scss | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss +index e2d479263..f2d5017c4 100644 +--- a/shell/sass/cinnamon/_common.scss ++++ b/shell/sass/cinnamon/_common.scss +@@ -606,6 +606,15 @@ $icon_size: 16px; + + #overview { spacing: 12px; } + ++// >=4.0 ++.overview-empty-placeholder { ++ color: $osd_fg_color; ++ font-size: 1.5em; ++} ++.window-border { ++ outline: 0 none transparent; ++ border: 2px solid $osd_indicator_color; ++} + .window-caption { + -cinnamon-caption-spacing: 12px; + spacing: 25px; +@@ -617,7 +626,8 @@ $icon_size: 16px; + + // FIXME: Cinnamon does not have 'window-clone-border' + // and the name 'selected' looks incorrect, should be 'focused' instead +- &#selected { ++ // selector is :focus for >=4.0 ++ &#selected, &:focus { + spacing: 25px; + color: $selected_fg_color; + background-color: $osd_indicator_color; + +From 70c5f7e2c58b256d253a23ebfcea70b82a75b818 Mon Sep 17 00:00:00 2001 +From: smurphos <29017677+smurphos@users.noreply.github.com> +Date: Sat, 17 Nov 2018 09:04:01 +0000 +Subject: [PATCH 2/6] Cinnamon 4 - new stock menu styling + +--- + shell/sass/cinnamon/_common.scss | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss +index f2d5017c4..9ec7d479f 100644 +--- a/shell/sass/cinnamon/_common.scss ++++ b/shell/sass/cinnamon/_common.scss +@@ -1260,7 +1260,17 @@ $ws_thumb_spacing: 32px; + // from other applet menus + &-background { + } +- ++ // top-box and systembuttons-box are for the abortive version 4.0 stock menu. Included in case it ever returns. ++ &-top-box { ++ spacing: 10px; ++ } ++ &-systembuttons-box { ++ padding: 5px 0; ++ } ++ .menu-favorites-button { ++ padding: 5px; ++ &:hover { @include button(flat-hover); } ++ } + &-favorites-box { + padding: 7px; + border-radius: 0; + +From 8146aca90841abcdee68cd6e54da120e52564bf7 Mon Sep 17 00:00:00 2001 +From: smurphos <29017677+smurphos@users.noreply.github.com> +Date: Sat, 17 Nov 2018 09:05:38 +0000 +Subject: [PATCH 3/6] Cinnamon 4 - GWL applet styling + +--- + shell/sass/cinnamon/_common.scss | 154 +++++++++++++++++++++++++++++++ + 1 file changed, 154 insertions(+) + +diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss +index 9ec7d479f..a002ead5e 100644 +--- a/shell/sass/cinnamon/_common.scss ++++ b/shell/sass/cinnamon/_common.scss +@@ -1579,6 +1579,160 @@ $ws_thumb_spacing: 32px; + background: none; + } + } ++// GWL is a cinnamon v>4.0 stock applet ++// /******************************* ++// * Grouped window list ++// *******************************/ ++ ++.grouped-window-list { ++ &-thumbnail-label { ++ padding-left: 4px; ++ } ++ &-number-label { ++ @include fontscaling($ref_size * 0.9); ++ color: $selected_fg_color; ++ font-weight: 700; ++ } ++ &-badge { ++ border-radius: 256px; ++ background-color: #000000; ++ // to prevent overlap of badge and box-shadow in top and left panel in larger icon sizes. ++ .panel-top & { margin-top: 2px } ++ .panel-left & { margin-left: 2px } ++ } ++ &-button-label { ++ padding-left: 4px; ++ } ++ &-thumbnail-alert { ++ background: rgba(255, 52, 52, 0.3); ++ } ++ ++ &-item-box { ++ border: 0 none transparent; ++ border-image: none; ++ background-image: none; ++ background-color: $hidden_fill_color; ++ color: $osd_fg_color; ++ box-shadow: $empty_shadow; ++ font-weight: 400; ++ .panel-top &, ++ .panel-bottom &, ++ .panel-left &, ++ .panel-right & { ++ StIcon, StBin { padding: 0; } ++ } ++ ++ @each $position, $_indicator in (top, 0 2px), ++ (bottom, 0 -2px), ++ (left, 2px 0), ++ (right, -2px 0) { ++ .panel-#{$position} & { ++ spacing: 0; ++ padding: 0; ++ border: 0 none transparent; ++ border-image: none; ++ background-color: $hidden_fill_color; ++ box-shadow: $empty_shadow; ++ // emulate two state themeing as per current themeing for icing task manager and window-list. ++ &:active, &:hover, &active:hover { ++ background-color: $hidden_fill_color; ++ box-shadow: inset #{$_indicator} $osd_outline_fill_color; ++ } ++ &:focus, &:active:focus, &:focus:hover, &:active:focus:hover { ++ background-color: $hidden_fill_color; ++ box-shadow: inset #{$_indicator} $osd_indicator_color; ++ } ++ } ++ } ++ ++ StLabel { ++ font-weight: 400; ++ ++ .panel-top &, ++ .panel-bottom & { ++ &:ltr { ++ padding: 0 (6px - 2px) 0 0; ++ } ++ &:rtl { ++ padding: 0 0 0 (6px - 2px); ++ } ++ } ++ } ++ ++ &:progress, ++ .progress { ++ background-gradient-start: $accent_fill_color; ++ background-gradient-end: $accent_fill_color; ++ } ++ } ++ ++ &-item-demands-attention { ++ background-gradient-start: $accent_fill_color; ++ background-gradient-end: $accent_fill_color; ++ color: $selected_fg_color; ++ ++ @each $position, $_indicator in (top, 0 2px), (bottom, 0 -2px), (left, 2px 0), (right, -2px 0) { ++ .panel-#{$position} & { ++ box-shadow: inset #{$_indicator} $accent_color; ++ } ++ } ++ } ++ &-thumbnail-menu { ++ padding: 20px; ++ border: none; ++ border-image: url('assets/misc/osd.svg') 9 9 9 9; ++ border-radius: 2px; ++ color: $osd_fg_color; ++ background: none; ++ ++ > StBoxLayout { ++ padding: 4px; ++ } ++ ++ .item-box { ++ padding: 8px; ++ border-radius: 0; // fill entire surface to cover up the parent ++ background-color: $osd_bg_color; // use opaque ++ &:outlined, ++ &:selected { border-radius: 2px; } ++ &:outlined { ++ padding: 6px; ++ border: 2px solid $osd_outline_fill_color; ++ } ++ &:selected { ++ background-color: mix($osd_bg_color, $accent_color, 75%); ++ color: $inverted_accent_label_color; ++ } ++ ++ > StBoxLayout { // icon and title ++ &:ltr { margin: 6px 0 0 6px; } ++ &:rtl { margin: 6px 6px 0 0; } ++ ++ StLabel { padding-bottom: 0.1em; } ++ } ++ ++ > StButton { // close button ++ &:ltr { margin: 6px 6px 0 0; } ++ &:rtl { margin: 6px 0 0 6px; } ++ } ++ } ++ ++ .thumbnail { ++ width: 256px; ++ margin: 6px; ++ } ++ ++ .thumbnail-box { ++ padding: 2px; ++ spacing: 4px; ++ } ++ ++ .separator { ++ width: 1px; ++ background: $borders_color; ++ } ++ } ++} + + + // /*********************************** + +From 20177a662bff1e739340f87f2fba9a35a208edaf Mon Sep 17 00:00:00 2001 +From: smurphos <29017677+smurphos@users.noreply.github.com> +Date: Sat, 17 Nov 2018 09:06:47 +0000 +Subject: [PATCH 4/6] Cinnamon - reduce menu search width and add some padding + to menu-context-menu for Cinnamenu compatibility + +--- + shell/sass/cinnamon/_common.scss | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss +index a002ead5e..86fc65294 100644 +--- a/shell/sass/cinnamon/_common.scss ++++ b/shell/sass/cinnamon/_common.scss +@@ -1412,7 +1412,7 @@ $ws_thumb_spacing: 32px; + + #menu-search-entry { + @extend %entry; +- width: 24em; ++ width: 16em; + caret-color: $fg_color; + font-weight: 500; + } +@@ -1424,6 +1424,7 @@ $ws_thumb_spacing: 32px; + + // Context menu (at the moment only for favorites) + .menu-context-menu { ++padding: 0.5em; + } + + + +From db47c7403c3646961924013107e88b26d44f82ef Mon Sep 17 00:00:00 2001 +From: smurphos <29017677+smurphos@users.noreply.github.com> +Date: Sat, 17 Nov 2018 09:09:21 +0000 +Subject: [PATCH 5/6] Cinnamon - bugfix - workspace switcher on vertical panels + +--- + shell/sass/cinnamon/_common.scss | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss +index 86fc65294..616133773 100644 +--- a/shell/sass/cinnamon/_common.scss ++++ b/shell/sass/cinnamon/_common.scss +@@ -1836,7 +1836,11 @@ padding: 0.5em; + background-color: $hidden_fill_color; + transition-duration: 0.2s; + +- // .vertical & { padding: 3px; } // NEEDS_REVIEW ++.vertical & { ++ width: 10px; ++ height: 20px; ++ // padding: 3px 0; // NEEDS_REVIEW ++} + + &:hover { + color: $selected_fg_color; +@@ -1869,7 +1873,11 @@ padding: 0.5em; + .workspace-graph { + padding: 3px; + spacing: 3px; +- ++ ++ .vertical & { ++ padding: 0; ++ } ++ + .workspace { + border: 1px solid shellopacity(black, 0.4); + background-gradient-direction: none; + +From a098df43a80df6e5c47f11484c4bc04479892108 Mon Sep 17 00:00:00 2001 +From: smurphos <29017677+smurphos@users.noreply.github.com> +Date: Sun, 18 Nov 2018 04:14:08 +0000 +Subject: [PATCH 6/6] Cinnamon - GWL bugfix + +--- + shell/sass/cinnamon/_common.scss | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss +index 616133773..718d8cdf4 100644 +--- a/shell/sass/cinnamon/_common.scss ++++ b/shell/sass/cinnamon/_common.scss +@@ -1634,12 +1634,12 @@ padding: 0.5em; + border-image: none; + background-color: $hidden_fill_color; + box-shadow: $empty_shadow; +- // emulate two state themeing as per current themeing for icing task manager and window-list. +- &:active, &:hover, &active:hover { ++ // emulate two state theming as per current theming for icing task manager and window-list. ++ &:active, &:checked { + background-color: $hidden_fill_color; + box-shadow: inset #{$_indicator} $osd_outline_fill_color; + } +- &:focus, &:active:focus, &:focus:hover, &:active:focus:hover { ++ &:hover, &:active:hover, &:focus, &:active:focus, &:focus:hover, &:active:focus:hover { + background-color: $hidden_fill_color; + box-shadow: inset #{$_indicator} $osd_indicator_color; + } diff --git a/sources b/sources index b4b8f3d..de86558 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (adapta-gtk-theme-3.94.0.149.tar.gz) = bc547ce8863850e7229ee6586ba2c11aae61d10cb5160699288ca5b8d2b130aef70b84aaf026f4050ae4850fea7f7d8bd0e2de0607d536f58f20b16adef74b85 +SHA512 (adapta-gtk-theme-3.95.0.11.tar.gz) = 648f8ad2cf8095c599ff4be4d6d47e0935d6b5bea65c27a36ea69cca89129c59fd078b629a38a048ef300c1bb4ca506c18c4ef0afc9753134894d3a99c83fff1 From e059df192dbf0e4a98abffa0bfef569717c50899 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 12:56:51 +0000 Subject: [PATCH 06/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adapta-gtk-theme.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adapta-gtk-theme.spec b/adapta-gtk-theme.spec index cc76671..201a588 100644 --- a/adapta-gtk-theme.spec +++ b/adapta-gtk-theme.spec @@ -1,7 +1,7 @@ Name: adapta-gtk-theme Summary: An adaptive Gtk+ theme based on Material Design Guidelines Version: 3.95.0.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and CC-BY-SA URL: https://github.com/adapta-project/%{name} @@ -115,6 +115,9 @@ ln -s %{_datadir}/themes/Adapta/plank/dock.theme \ %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 3.95.0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jan 26 2019 Leigh Scott - 3.95.0.11-1 - Update to version 3.95.0.11 - Add cinnamon-4 theme updates From 44f6c8155c83bca9cde8a538033774834fac17bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:32:15 +0000 Subject: [PATCH 07/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adapta-gtk-theme.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adapta-gtk-theme.spec b/adapta-gtk-theme.spec index 201a588..2f5b3b8 100644 --- a/adapta-gtk-theme.spec +++ b/adapta-gtk-theme.spec @@ -1,7 +1,7 @@ Name: adapta-gtk-theme Summary: An adaptive Gtk+ theme based on Material Design Guidelines Version: 3.95.0.11 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and CC-BY-SA URL: https://github.com/adapta-project/%{name} @@ -115,6 +115,9 @@ ln -s %{_datadir}/themes/Adapta/plank/dock.theme \ %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 3.95.0.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 3.95.0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c6eb0f92866e90ff8aa622599ade83e1cf2a8e7a Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Mon, 16 Sep 2019 15:35:26 +0300 Subject: [PATCH 08/10] Add 'adapta-backgrounds' and 'papirus-icon-theme' as Recommends --- adapta-gtk-theme.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/adapta-gtk-theme.spec b/adapta-gtk-theme.spec index 2f5b3b8..e2ad110 100644 --- a/adapta-gtk-theme.spec +++ b/adapta-gtk-theme.spec @@ -1,14 +1,13 @@ Name: adapta-gtk-theme Summary: An adaptive Gtk+ theme based on Material Design Guidelines Version: 3.95.0.11 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and CC-BY-SA -URL: https://github.com/adapta-project/%{name} +URL: https://github.com/adapta-project/adapta-gtk-theme Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz # Upstream pull request for cinnamon-4 support Patch0: %{url}/pull/745.patch#/cinnamon4_update.patch - BuildArch: noarch BuildRequires: autoconf @@ -16,16 +15,19 @@ BuildRequires: automake BuildRequires: fdupes BuildRequires: inkscape >= 0.91 BuildRequires: parallel +BuildRequires: procps-ng +BuildRequires: sassc >= 3.3 +BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: procps-ng -BuildRequires: sassc >= 3.3 - Requires: gnome-themes-standard Requires: google-noto-sans-fonts Requires: google-roboto-fonts Requires: gtk2-engines +%if 0%{?fedora} || 0%{?rhel} >= 8 +Recommends: adapta-backgrounds +Recommends: papirus-icon-theme +%endif %description %{summary}. @@ -115,6 +117,9 @@ ln -s %{_datadir}/themes/Adapta/plank/dock.theme \ %changelog +* Mon Sep 16 2019 Artem Polishchuk - 3.95.0.11-4 +- Add 'adapta-backgrounds' and 'papirus-icon-theme' as Recommends + * Wed Jul 24 2019 Fedora Release Engineering - 3.95.0.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 0169d5fc49fdf351ff95eb5568b2877330e57962 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:11:31 +0000 Subject: [PATCH 09/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adapta-gtk-theme.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adapta-gtk-theme.spec b/adapta-gtk-theme.spec index e2ad110..a4985e7 100644 --- a/adapta-gtk-theme.spec +++ b/adapta-gtk-theme.spec @@ -1,7 +1,7 @@ Name: adapta-gtk-theme Summary: An adaptive Gtk+ theme based on Material Design Guidelines Version: 3.95.0.11 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 and CC-BY-SA URL: https://github.com/adapta-project/adapta-gtk-theme @@ -117,6 +117,9 @@ ln -s %{_datadir}/themes/Adapta/plank/dock.theme \ %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 3.95.0.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Sep 16 2019 Artem Polishchuk - 3.95.0.11-4 - Add 'adapta-backgrounds' and 'papirus-icon-theme' as Recommends From 2b4dc2c7e15be3a0c6bdf9807097e6668ebf8d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 18 May 2020 14:05:08 +0200 Subject: [PATCH 10/10] Orphaned for 6+ weeks --- .gitignore | 1 - README.md | 3 - adapta-gtk-theme.spec | 233 --------------------------- cinnamon4_update.patch | 349 ----------------------------------------- dead.package | 1 + sources | 1 - 6 files changed, 1 insertion(+), 587 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md delete mode 100644 adapta-gtk-theme.spec delete mode 100644 cinnamon4_update.patch create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f2f888e..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/adapta-gtk-theme-*.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 8a8ab8c..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# adapta-gtk-theme - -The adapta-gtk-theme package \ No newline at end of file diff --git a/adapta-gtk-theme.spec b/adapta-gtk-theme.spec deleted file mode 100644 index a4985e7..0000000 --- a/adapta-gtk-theme.spec +++ /dev/null @@ -1,233 +0,0 @@ -Name: adapta-gtk-theme -Summary: An adaptive Gtk+ theme based on Material Design Guidelines -Version: 3.95.0.11 -Release: 5%{?dist} -License: GPLv2 and CC-BY-SA - -URL: https://github.com/adapta-project/adapta-gtk-theme -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# Upstream pull request for cinnamon-4 support -Patch0: %{url}/pull/745.patch#/cinnamon4_update.patch -BuildArch: noarch - -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: fdupes -BuildRequires: inkscape >= 0.91 -BuildRequires: parallel -BuildRequires: procps-ng -BuildRequires: sassc >= 3.3 -BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(libxml-2.0) -Requires: gnome-themes-standard -Requires: google-noto-sans-fonts -Requires: google-roboto-fonts -Requires: gtk2-engines -%if 0%{?fedora} || 0%{?rhel} >= 8 -Recommends: adapta-backgrounds -Recommends: papirus-icon-theme -%endif - -%description -%{summary}. - - -%package gedit -Summary: Gedit style addon for %{name} - -Requires: %{name} == %{version}-%{release} -Requires: gtksourceview3 - -%if 0%{?fedora} || 0%{?rhel} >= 8 -Supplements: (%{name} and gtksourceview3) -%endif - -%description gedit -Gedit style addon for %{name}. - - -%package plank -Summary: Plank dock theme addon for %{name} - -Requires: %{name} == %{version}-%{release} -%if 0%{?fedora} -Requires: plank -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 8 -Supplements: (%{name} and plank) -%endif - -%description plank -Plank dock theme addon for %{name}. - - -%prep -%autosetup -p1 -%{_bindir}/autoreconf -fiv - - -%build -%configure \ - --disable-silent-rules \ - --enable-gtk_next \ - --enable-plank \ - --enable-telegram \ - --enable-parallel -%make_build - - -%install -%make_install -for f in COPYING LICENSE_CC_BY_SA4 README.md; do - %{_bindir}/find %{buildroot} -type f -name "$f" -print -delete -done - -# Add the gedit styles addon to the right location. -mkdir -p %{buildroot}%{_datadir}/gtksourceview-3.0/styles -ln -s %{_datadir}/themes/Adapta/gedit/adapta.xml \ - %{buildroot}%{_datadir}/gtksourceview-3.0/styles/adapta.xml - -# Add the plank addon to the right location. -mkdir -p %{buildroot}%{_datadir}/plank/themes/Adapta -ln -s %{_datadir}/themes/Adapta/plank/dock.theme \ - %{buildroot}%{_datadir}/plank/themes/Adapta/dock.theme - -%fdupes -s %{buildroot}%{_datadir}/themes - - -%files -%license COPYING LICENSE_CC_BY_SA4 -%doc README.md -%{_datadir}/themes/Adapta* - - -%files gedit -%doc extra/gedit/README.md -%{_datadir}/gtksourceview-3.0/styles/adapta.xml - - -%files plank -%if 0%{?fedora} -%{_datadir}/plank/themes/Adapta -%else -%{_datadir}/plank -%endif - - -%changelog -* Tue Jan 28 2020 Fedora Release Engineering - 3.95.0.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Sep 16 2019 Artem Polishchuk - 3.95.0.11-4 -- Add 'adapta-backgrounds' and 'papirus-icon-theme' as Recommends - -* Wed Jul 24 2019 Fedora Release Engineering - 3.95.0.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 3.95.0.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jan 26 2019 Leigh Scott - 3.95.0.11-1 -- Update to version 3.95.0.11 -- Add cinnamon-4 theme updates - -* Fri Sep 07 2018 Fabio Valentini - 3.94.0.149-1 -- Update to version 3.94.0.149. - -* Tue Aug 28 2018 Leigh Scott - 3.94.0.132-1 -- New upstream release - -* Thu Jul 12 2018 Fedora Release Engineering - 3.93.1.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon May 14 2018 Björn Esser - 3.93.1.16-1 -- New upstream release (#1577681) - -* Wed May 09 2018 Björn Esser - 3.93.1.14-1 -- New upstream release (#1574053) - -* Fri Apr 27 2018 Björn Esser - 3.93.1.1-1 -- New upstream release (#1571772) - -* Wed Apr 25 2018 Björn Esser - 3.93.0.280-1 -- New upstream release (#1571772) - -* Mon Apr 23 2018 Björn Esser - 3.93.0.277-1 -- New upstream release (#1565107) - -* Fri Apr 06 2018 Björn Esser - 3.93.0.237-1 -- New upstream release (#1563879) - -* Fri Apr 06 2018 Björn Esser - 3.93.0.229-1 -- New upstream release (#1563879) - -* Mon Apr 02 2018 Björn Esser - 3.93.0.225-1 -- New upstream release (#1562555) - -* Fri Mar 30 2018 Björn Esser - 3.93.0.220-1 -- New upstream release (#1562036) - -* Sun Mar 25 2018 Björn Esser - 3.93.0.200-1 -- New upstream release (#1554156) - -* Mon Mar 12 2018 Björn Esser - 3.93.0.174-1 -- New upstream release (#1554156) - -* Sat Mar 03 2018 Björn Esser - 3.93.0.153-1 -- New upstream release (#1551163) - -* Thu Mar 01 2018 Björn Esser - 3.93.0.152-1 -- New upstream release (#1548893) - -* Tue Feb 13 2018 Björn Esser - 3.93.0.119-1 -- New upstream release (#1544740) - -* Mon Feb 12 2018 Björn Esser - 3.93.0.117-1 -- New upstream release (#1542937) - -* Wed Feb 07 2018 Fedora Release Engineering - 3.93.0.110-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Feb 05 2018 Björn Esser - 3.93.0.110-1 -- New upstream release (#1542020) - -* Thu Feb 01 2018 Björn Esser - 3.93.0.103-1 -- New upstream release (#1540388) - -* Sun Jan 28 2018 Björn Esser - 3.93.0.90-1 -- New upstream release (#1539334) - -* Fri Jan 26 2018 Björn Esser - 3.93.0.86-1 -- New upstream release (#1537086) - -* Thu Jan 25 2018 Björn Esser - 3.93.0.81-1 -- New upstream release (#1537086) - -* Fri Jan 19 2018 Björn Esser - 3.93.0.66-1 -- New upstream release (#1535991) - -* Wed Jan 17 2018 Björn Esser - 3.93.0.56-1 -- New upstream release (#1535451) - -* Tue Jan 16 2018 Björn Esser - 3.93.0.49-1 -- New upstream release (#1534976) - -* Sun Jan 14 2018 Björn Esser - 3.93.0.43-1 -- New upstream release (#1534246) - -* Fri Dec 29 2017 Björn Esser - 3.92.2.63-1 -- Initial import (#1529593) - -* Fri Dec 29 2017 Björn Esser - 3.92.2.63-0.4 -- Fix Summary and %%description for plank sub-package - -* Fri Dec 29 2017 Björn Esser - 3.92.2.63-0.3 -- Fix source url - -* Thu Dec 28 2017 Björn Esser - 3.92.2.63-0.2 -- Add sub-packages for gedit / xed and plank - -* Thu Dec 28 2017 Björn Esser - 3.92.2.63-0.1 -- Initial rpm release (#1529593) diff --git a/cinnamon4_update.patch b/cinnamon4_update.patch deleted file mode 100644 index 5bb17ba..0000000 --- a/cinnamon4_update.patch +++ /dev/null @@ -1,349 +0,0 @@ -From 3ac96e3f2e4e8b2cc6095e0ffd47f5f4eb139efa Mon Sep 17 00:00:00 2001 -From: smurphos <29017677+smurphos@users.noreply.github.com> -Date: Sat, 17 Nov 2018 09:02:53 +0000 -Subject: [PATCH 1/6] Cinnanmon 4 - overview styling - ---- - shell/sass/cinnamon/_common.scss | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss -index e2d479263..f2d5017c4 100644 ---- a/shell/sass/cinnamon/_common.scss -+++ b/shell/sass/cinnamon/_common.scss -@@ -606,6 +606,15 @@ $icon_size: 16px; - - #overview { spacing: 12px; } - -+// >=4.0 -+.overview-empty-placeholder { -+ color: $osd_fg_color; -+ font-size: 1.5em; -+} -+.window-border { -+ outline: 0 none transparent; -+ border: 2px solid $osd_indicator_color; -+} - .window-caption { - -cinnamon-caption-spacing: 12px; - spacing: 25px; -@@ -617,7 +626,8 @@ $icon_size: 16px; - - // FIXME: Cinnamon does not have 'window-clone-border' - // and the name 'selected' looks incorrect, should be 'focused' instead -- &#selected { -+ // selector is :focus for >=4.0 -+ &#selected, &:focus { - spacing: 25px; - color: $selected_fg_color; - background-color: $osd_indicator_color; - -From 70c5f7e2c58b256d253a23ebfcea70b82a75b818 Mon Sep 17 00:00:00 2001 -From: smurphos <29017677+smurphos@users.noreply.github.com> -Date: Sat, 17 Nov 2018 09:04:01 +0000 -Subject: [PATCH 2/6] Cinnamon 4 - new stock menu styling - ---- - shell/sass/cinnamon/_common.scss | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss -index f2d5017c4..9ec7d479f 100644 ---- a/shell/sass/cinnamon/_common.scss -+++ b/shell/sass/cinnamon/_common.scss -@@ -1260,7 +1260,17 @@ $ws_thumb_spacing: 32px; - // from other applet menus - &-background { - } -- -+ // top-box and systembuttons-box are for the abortive version 4.0 stock menu. Included in case it ever returns. -+ &-top-box { -+ spacing: 10px; -+ } -+ &-systembuttons-box { -+ padding: 5px 0; -+ } -+ .menu-favorites-button { -+ padding: 5px; -+ &:hover { @include button(flat-hover); } -+ } - &-favorites-box { - padding: 7px; - border-radius: 0; - -From 8146aca90841abcdee68cd6e54da120e52564bf7 Mon Sep 17 00:00:00 2001 -From: smurphos <29017677+smurphos@users.noreply.github.com> -Date: Sat, 17 Nov 2018 09:05:38 +0000 -Subject: [PATCH 3/6] Cinnamon 4 - GWL applet styling - ---- - shell/sass/cinnamon/_common.scss | 154 +++++++++++++++++++++++++++++++ - 1 file changed, 154 insertions(+) - -diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss -index 9ec7d479f..a002ead5e 100644 ---- a/shell/sass/cinnamon/_common.scss -+++ b/shell/sass/cinnamon/_common.scss -@@ -1579,6 +1579,160 @@ $ws_thumb_spacing: 32px; - background: none; - } - } -+// GWL is a cinnamon v>4.0 stock applet -+// /******************************* -+// * Grouped window list -+// *******************************/ -+ -+.grouped-window-list { -+ &-thumbnail-label { -+ padding-left: 4px; -+ } -+ &-number-label { -+ @include fontscaling($ref_size * 0.9); -+ color: $selected_fg_color; -+ font-weight: 700; -+ } -+ &-badge { -+ border-radius: 256px; -+ background-color: #000000; -+ // to prevent overlap of badge and box-shadow in top and left panel in larger icon sizes. -+ .panel-top & { margin-top: 2px } -+ .panel-left & { margin-left: 2px } -+ } -+ &-button-label { -+ padding-left: 4px; -+ } -+ &-thumbnail-alert { -+ background: rgba(255, 52, 52, 0.3); -+ } -+ -+ &-item-box { -+ border: 0 none transparent; -+ border-image: none; -+ background-image: none; -+ background-color: $hidden_fill_color; -+ color: $osd_fg_color; -+ box-shadow: $empty_shadow; -+ font-weight: 400; -+ .panel-top &, -+ .panel-bottom &, -+ .panel-left &, -+ .panel-right & { -+ StIcon, StBin { padding: 0; } -+ } -+ -+ @each $position, $_indicator in (top, 0 2px), -+ (bottom, 0 -2px), -+ (left, 2px 0), -+ (right, -2px 0) { -+ .panel-#{$position} & { -+ spacing: 0; -+ padding: 0; -+ border: 0 none transparent; -+ border-image: none; -+ background-color: $hidden_fill_color; -+ box-shadow: $empty_shadow; -+ // emulate two state themeing as per current themeing for icing task manager and window-list. -+ &:active, &:hover, &active:hover { -+ background-color: $hidden_fill_color; -+ box-shadow: inset #{$_indicator} $osd_outline_fill_color; -+ } -+ &:focus, &:active:focus, &:focus:hover, &:active:focus:hover { -+ background-color: $hidden_fill_color; -+ box-shadow: inset #{$_indicator} $osd_indicator_color; -+ } -+ } -+ } -+ -+ StLabel { -+ font-weight: 400; -+ -+ .panel-top &, -+ .panel-bottom & { -+ &:ltr { -+ padding: 0 (6px - 2px) 0 0; -+ } -+ &:rtl { -+ padding: 0 0 0 (6px - 2px); -+ } -+ } -+ } -+ -+ &:progress, -+ .progress { -+ background-gradient-start: $accent_fill_color; -+ background-gradient-end: $accent_fill_color; -+ } -+ } -+ -+ &-item-demands-attention { -+ background-gradient-start: $accent_fill_color; -+ background-gradient-end: $accent_fill_color; -+ color: $selected_fg_color; -+ -+ @each $position, $_indicator in (top, 0 2px), (bottom, 0 -2px), (left, 2px 0), (right, -2px 0) { -+ .panel-#{$position} & { -+ box-shadow: inset #{$_indicator} $accent_color; -+ } -+ } -+ } -+ &-thumbnail-menu { -+ padding: 20px; -+ border: none; -+ border-image: url('assets/misc/osd.svg') 9 9 9 9; -+ border-radius: 2px; -+ color: $osd_fg_color; -+ background: none; -+ -+ > StBoxLayout { -+ padding: 4px; -+ } -+ -+ .item-box { -+ padding: 8px; -+ border-radius: 0; // fill entire surface to cover up the parent -+ background-color: $osd_bg_color; // use opaque -+ &:outlined, -+ &:selected { border-radius: 2px; } -+ &:outlined { -+ padding: 6px; -+ border: 2px solid $osd_outline_fill_color; -+ } -+ &:selected { -+ background-color: mix($osd_bg_color, $accent_color, 75%); -+ color: $inverted_accent_label_color; -+ } -+ -+ > StBoxLayout { // icon and title -+ &:ltr { margin: 6px 0 0 6px; } -+ &:rtl { margin: 6px 6px 0 0; } -+ -+ StLabel { padding-bottom: 0.1em; } -+ } -+ -+ > StButton { // close button -+ &:ltr { margin: 6px 6px 0 0; } -+ &:rtl { margin: 6px 0 0 6px; } -+ } -+ } -+ -+ .thumbnail { -+ width: 256px; -+ margin: 6px; -+ } -+ -+ .thumbnail-box { -+ padding: 2px; -+ spacing: 4px; -+ } -+ -+ .separator { -+ width: 1px; -+ background: $borders_color; -+ } -+ } -+} - - - // /*********************************** - -From 20177a662bff1e739340f87f2fba9a35a208edaf Mon Sep 17 00:00:00 2001 -From: smurphos <29017677+smurphos@users.noreply.github.com> -Date: Sat, 17 Nov 2018 09:06:47 +0000 -Subject: [PATCH 4/6] Cinnamon - reduce menu search width and add some padding - to menu-context-menu for Cinnamenu compatibility - ---- - shell/sass/cinnamon/_common.scss | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss -index a002ead5e..86fc65294 100644 ---- a/shell/sass/cinnamon/_common.scss -+++ b/shell/sass/cinnamon/_common.scss -@@ -1412,7 +1412,7 @@ $ws_thumb_spacing: 32px; - - #menu-search-entry { - @extend %entry; -- width: 24em; -+ width: 16em; - caret-color: $fg_color; - font-weight: 500; - } -@@ -1424,6 +1424,7 @@ $ws_thumb_spacing: 32px; - - // Context menu (at the moment only for favorites) - .menu-context-menu { -+padding: 0.5em; - } - - - -From db47c7403c3646961924013107e88b26d44f82ef Mon Sep 17 00:00:00 2001 -From: smurphos <29017677+smurphos@users.noreply.github.com> -Date: Sat, 17 Nov 2018 09:09:21 +0000 -Subject: [PATCH 5/6] Cinnamon - bugfix - workspace switcher on vertical panels - ---- - shell/sass/cinnamon/_common.scss | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss -index 86fc65294..616133773 100644 ---- a/shell/sass/cinnamon/_common.scss -+++ b/shell/sass/cinnamon/_common.scss -@@ -1836,7 +1836,11 @@ padding: 0.5em; - background-color: $hidden_fill_color; - transition-duration: 0.2s; - -- // .vertical & { padding: 3px; } // NEEDS_REVIEW -+.vertical & { -+ width: 10px; -+ height: 20px; -+ // padding: 3px 0; // NEEDS_REVIEW -+} - - &:hover { - color: $selected_fg_color; -@@ -1869,7 +1873,11 @@ padding: 0.5em; - .workspace-graph { - padding: 3px; - spacing: 3px; -- -+ -+ .vertical & { -+ padding: 0; -+ } -+ - .workspace { - border: 1px solid shellopacity(black, 0.4); - background-gradient-direction: none; - -From a098df43a80df6e5c47f11484c4bc04479892108 Mon Sep 17 00:00:00 2001 -From: smurphos <29017677+smurphos@users.noreply.github.com> -Date: Sun, 18 Nov 2018 04:14:08 +0000 -Subject: [PATCH 6/6] Cinnamon - GWL bugfix - ---- - shell/sass/cinnamon/_common.scss | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss -index 616133773..718d8cdf4 100644 ---- a/shell/sass/cinnamon/_common.scss -+++ b/shell/sass/cinnamon/_common.scss -@@ -1634,12 +1634,12 @@ padding: 0.5em; - border-image: none; - background-color: $hidden_fill_color; - box-shadow: $empty_shadow; -- // emulate two state themeing as per current themeing for icing task manager and window-list. -- &:active, &:hover, &active:hover { -+ // emulate two state theming as per current theming for icing task manager and window-list. -+ &:active, &:checked { - background-color: $hidden_fill_color; - box-shadow: inset #{$_indicator} $osd_outline_fill_color; - } -- &:focus, &:active:focus, &:focus:hover, &:active:focus:hover { -+ &:hover, &:active:hover, &:focus, &:active:focus, &:focus:hover, &:active:focus:hover { - background-color: $hidden_fill_color; - box-shadow: inset #{$_indicator} $osd_indicator_color; - } diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index de86558..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (adapta-gtk-theme-3.95.0.11.tar.gz) = 648f8ad2cf8095c599ff4be4d6d47e0935d6b5bea65c27a36ea69cca89129c59fd078b629a38a048ef300c1bb4ca506c18c4ef0afc9753134894d3a99c83fff1