From 1dae55fda54a47dec21367e9c907000fb91594df Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Dec 19 2018 14:25:23 +0000 Subject: New upstream release --- diff --git a/arc-theme.spec b/arc-theme.spec index 04226f0..fdb73ea 100644 --- a/arc-theme.spec +++ b/arc-theme.spec @@ -1,4 +1,4 @@ -%global common_configure --disable-unity --srcdir=.. +%global common_configure --disable-unity --with-gnome-shell=3.30 --srcdir=.. %global common_desc \ Arc is a flat theme with transparent elements for GTK 3, GTK 2 and \ @@ -7,19 +7,15 @@ like Gnome, Cinnamon, Budgie, Pantheon, XFCE, Mate, etc. Name: arc-theme -Version: 20170302 -Release: 10%{?dist} +Version: 20181022 +Release: 1%{?dist} Summary: Flat theme with transparent elements License: GPLv3+ -URL: https://github.com/horst3180/%{name} +URL: https://github.com/NicoHood/%{name} Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: %{url}/pull/788.patch#/remove_margin_auto.patch -Patch1: fix-OSD.patch -Patch2: %{url}/pull/790.patch#/support_xed.patch -Patch3: %{url}/commit/4b75f33ff2cfedb6ba0809cf877deb2d2831e6c3.patch#/gtk_324.patch -Patch4: %{url}/commit/7b1d4f3fb9635c21abc4221c008cfa9849fe53ff.patch#/install_dir_solid.patch -Patch5: %{url}/commit/8290cb813f157a22e64ae58ac3dfb5983b0416e6.patch#/update_readme.patch +Patch0: fix-OSD.patch +Patch1: support_xed.patch BuildArch: noarch @@ -27,6 +23,10 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes BuildRequires: gtk3-devel +BuildRequires: gtk-murrine-engine +BuildRequires: inkscape +BuildRequires: optipng +BuildRequires: sassc Requires: filesystem Requires: gnome-themes-standard @@ -99,6 +99,10 @@ popd %changelog +* Wed Dec 19 2018 Leigh Scott - 20181022-1 +- New upstream release +- Adds recent support for newer gnome-shell and cinnamon versions + * Thu Jul 12 2018 Fedora Release Engineering - 20170302-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/fix-OSD.patch b/fix-OSD.patch index 13b9bd8..d5c51ff 100644 --- a/fix-OSD.patch +++ b/fix-OSD.patch @@ -4,59 +4,9 @@ Date: Thu, 15 Jun 2017 12:19:54 +0100 Subject: [PATCH] fix OSD --- - common/cinnamon/cinnamon-dark.css | 6 +++--- - common/cinnamon/cinnamon.css | 6 +++--- common/cinnamon/sass/_common.scss | 8 +++++--- 3 files changed, 11 insertions(+), 9 deletions(-) -diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css -index 34f45ef..fc40088 100644 ---- a/common/cinnamon/cinnamon-dark.css -+++ b/common/cinnamon/cinnamon-dark.css -@@ -1064,9 +1064,6 @@ StScrollBar { - font-weight: bold; - spacing: 1em; - padding: 20px; -- margin: 32px; -- min-width: 64px; -- min-height: 64px; - color: white; - background: none; - border: none; -@@ -1080,6 +1077,9 @@ StScrollBar { - background-color: rgba(0, 0, 0, 0.5); - border-radius: 2px; - color: #5294e2; } -+ .osd-window .level-bar { -+ border-radius: 2px; -+ background-color: #5294e2; } - - .window-list-box { - spacing: 6px; -diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css -index b816ac3..d083ecf 100644 ---- a/common/cinnamon/cinnamon.css -+++ b/common/cinnamon/cinnamon.css -@@ -1064,9 +1064,6 @@ StScrollBar { - font-weight: bold; - spacing: 1em; - padding: 20px; -- margin: 32px; -- min-width: 64px; -- min-height: 64px; - color: white; - background: none; - border: none; -@@ -1080,6 +1077,9 @@ StScrollBar { - background-color: rgba(0, 0, 0, 0.5); - border-radius: 2px; - color: #5294e2; } -+ .osd-window .level-bar { -+ border-radius: 2px; -+ background-color: #5294e2; } - - .window-list-box { - spacing: 6px; diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss index 00af8f7..fee8520 100644 --- a/common/cinnamon/sass/_common.scss diff --git a/gtk_324.patch b/gtk_324.patch deleted file mode 100644 index 111f65f..0000000 --- a/gtk_324.patch +++ /dev/null @@ -1,725 +0,0 @@ -From 4b75f33ff2cfedb6ba0809cf877deb2d2831e6c3 Mon Sep 17 00:00:00 2001 -From: Horst3180 -Date: Fri, 12 May 2017 17:11:09 +0200 -Subject: [PATCH] gnome-shell 3.24 fixes - ---- - .../3.18/common-assets/misc/calendar-today.svg | 205 +++++++++++++++++++++ - common/gnome-shell/3.18/gnome-shell-dark.css | 69 +++++-- - common/gnome-shell/3.18/gnome-shell.css | 69 +++++-- - common/gnome-shell/3.18/sass/_common.scss | 58 ++++-- - 4 files changed, 355 insertions(+), 46 deletions(-) - create mode 100644 common/gnome-shell/3.18/common-assets/misc/calendar-today.svg - -diff --git a/common/gnome-shell/3.18/common-assets/misc/calendar-today.svg b/common/gnome-shell/3.18/common-assets/misc/calendar-today.svg -new file mode 100644 -index 000000000..b5a41f6e4 ---- /dev/null -+++ b/common/gnome-shell/3.18/common-assets/misc/calendar-today.svg -@@ -0,0 +1,205 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ image/svg+xml -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css -index db3555a64..69438bb1f 100644 ---- a/common/gnome-shell/3.18/gnome-shell-dark.css -+++ b/common/gnome-shell/3.18/gnome-shell-dark.css -@@ -797,17 +797,20 @@ StScrollBar { - .datemenu-today-button, - .datemenu-displays-box, - .message-list-sections { -- margin: 0 1.5em; } -+ margin: 0 0.4em; } - - .datemenu-calendar-column { -- spacing: 0.5em; } -+ spacing: 0.5em; -+ border: none; } - - .datemenu-displays-section { - padding-bottom: 3em; } - - .datemenu-today-button, - .world-clocks-button, --.message-list-section-title { -+.weather-button, -+.message-list-section-title, -+.events-section-title { - border-radius: 3px; - padding: .4em; } - -@@ -819,14 +822,20 @@ StScrollBar { - - .datemenu-today-button, - .world-clocks-button, --.message-list-section-title { -+.weather-button, -+.message-list-section-title, -+.events-section-title { - padding: 7px 10px 7px 10px; - border: 1px solid rgba(64, 69, 82, 0); } - .datemenu-today-button:hover, .datemenu-today-button:focus, - .world-clocks-button:hover, - .world-clocks-button:focus, -+ .weather-button:hover, -+ .weather-button:focus, - .message-list-section-title:hover, -- .message-list-section-title:focus { -+ .message-list-section-title:focus, -+ .events-section-title:hover, -+ .events-section-title:focus { - text-shadow: 0 1px rgba(64, 69, 82, 0); - color: #D3DAE3; - background-color: #505666; -@@ -834,7 +843,9 @@ StScrollBar { - box-shadow: inset 0 1px rgba(80, 86, 102, 0.05); } - .datemenu-today-button:active, - .world-clocks-button:active, -- .message-list-section-title:active { -+ .weather-button:active, -+ .message-list-section-title:active, -+ .events-section-title:active { - text-shadow: 0 1px rgba(64, 69, 82, 0); - color: #ffffff; - background-color: #5294e2; -@@ -845,16 +856,22 @@ StScrollBar { - font-size: 1.5em; } - - .world-clocks-header, --.message-list-section-title { -+.weather-header, -+.message-list-section-title, -+.events-section-title { - color: rgba(211, 218, 227, 0.4); - font-weight: bold; } - --.world-clocks-button:active .world-clocks-header { -+.world-clocks-button:active .world-clocks-header, -+.weather-button:active .weather-header { - color: #ffffff; } - - .world-clocks-grid { - spacing-rows: 0.4em; } - -+.weather-box { -+ spacing: 0.4em; } -+ - .calendar-month-label { - color: #D3DAE3; - font-weight: bold; -@@ -929,6 +946,7 @@ StScrollBar { - - .calendar-today, - .calendar-today:active, -+.calendar-today:selected, - .calendar-today:focus, - .calendar-today:hover { - font-weight: bold; -@@ -937,8 +955,8 @@ StScrollBar { - border-width: 0; } - - .calendar-day-with-events { -- color: #5294e2; -- font-weight: bold; } -+ font-weight: bold; -+ background-image: url("common-assets/misc/calendar-today.svg"); } - - .calendar-today.calendar-day-with-events { - color: #ffffff; } -@@ -971,6 +989,9 @@ StScrollBar { - height: 0; } - .message-list-placeholder StLabel { - color: rgba(211, 218, 227, 0.45); } -+ .message-list-clear-button.button { -+ margin: 1.5em 1.5em 0; -+ padding: 4px 12px; } - .message-list-section-close > StIcon { - icon-size: 18px; - border-radius: 0px; -@@ -1001,34 +1022,48 @@ StScrollBar { - .message-icon-bin:rtl { - padding: 8px 8px 8px 0px; } - .message-icon-bin > StIcon { -- icon-size: 32px; } -- .message-secondary-bin { -- color: rgba(211, 218, 227, 0.4); } -- .message-secondary-bin:ltr { -+ color: inherit; } -+ .message-secondary-bin, -+ .message-secondary-bin > .event-time { -+ color: rgba(211, 218, 227, 0.6); -+ font-size: 0.9em; } -+ .message-secondary-bin:ltr, -+ .message-secondary-bin > .event-time:ltr { - padding-left: 8px; } -- .message-secondary-bin:rtl { -+ .message-secondary-bin:rtl, -+ .message-secondary-bin > .event-time:rtl { - padding-right: 8px; } -+ .message:active .message-secondary-bin, -+ .message:active .message-secondary-bin > .event-time { -+ color: rgba(255, 255, 255, 0.6); } - .message-secondary-bin > StIcon { - icon-size: 16px; } - .message-title { -+ color: inherit; - font-weight: bold; - font-size: 1em; - padding: 2px 0 2px 0; } - .message-content { -+ color: inherit; - padding: 8px; - font-size: 1em; } - - .message-media-control { - padding: 6px; -- color: rgba(211, 218, 227, 0.45); } -+ color: #D3DAE3; } - .message-media-control:last-child:ltr { - padding-right: 18px; } - .message-media-control:last-child:rtl { - padding-left: 18px; } - .message-media-control:hover { -- color: #D3DAE3; } -+ color: rgba(211, 218, 227, 0.7); } - .message-media-control:active { - color: #5294e2; } -+ .message-media-control:insensitive { -+ color: rgba(211, 218, 227, 0.45); } -+ -+.message:active .message-media-control { -+ color: #ffffff; } - - .media-message-cover-icon { - icon-size: 32px; } -diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css -index 45b2d1d71..5d8c325e0 100644 ---- a/common/gnome-shell/3.18/gnome-shell.css -+++ b/common/gnome-shell/3.18/gnome-shell.css -@@ -797,17 +797,20 @@ StScrollBar { - .datemenu-today-button, - .datemenu-displays-box, - .message-list-sections { -- margin: 0 1.5em; } -+ margin: 0 0.4em; } - - .datemenu-calendar-column { -- spacing: 0.5em; } -+ spacing: 0.5em; -+ border: none; } - - .datemenu-displays-section { - padding-bottom: 3em; } - - .datemenu-today-button, - .world-clocks-button, --.message-list-section-title { -+.weather-button, -+.message-list-section-title, -+.events-section-title { - border-radius: 3px; - padding: .4em; } - -@@ -819,14 +822,20 @@ StScrollBar { - - .datemenu-today-button, - .world-clocks-button, --.message-list-section-title { -+.weather-button, -+.message-list-section-title, -+.events-section-title { - padding: 7px 10px 7px 10px; - border: 1px solid rgba(255, 255, 255, 0); } - .datemenu-today-button:hover, .datemenu-today-button:focus, - .world-clocks-button:hover, - .world-clocks-button:focus, -+ .weather-button:hover, -+ .weather-button:focus, - .message-list-section-title:hover, -- .message-list-section-title:focus { -+ .message-list-section-title:focus, -+ .events-section-title:hover, -+ .events-section-title:focus { - text-shadow: 0 1px rgba(255, 255, 255, 0); - color: #5c616c; - background-color: white; -@@ -834,7 +843,9 @@ StScrollBar { - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } - .datemenu-today-button:active, - .world-clocks-button:active, -- .message-list-section-title:active { -+ .weather-button:active, -+ .message-list-section-title:active, -+ .events-section-title:active { - text-shadow: 0 1px rgba(255, 255, 255, 0); - color: #ffffff; - background-color: #5294e2; -@@ -845,16 +856,22 @@ StScrollBar { - font-size: 1.5em; } - - .world-clocks-header, --.message-list-section-title { -+.weather-header, -+.message-list-section-title, -+.events-section-title { - color: rgba(92, 97, 108, 0.4); - font-weight: bold; } - --.world-clocks-button:active .world-clocks-header { -+.world-clocks-button:active .world-clocks-header, -+.weather-button:active .weather-header { - color: #ffffff; } - - .world-clocks-grid { - spacing-rows: 0.4em; } - -+.weather-box { -+ spacing: 0.4em; } -+ - .calendar-month-label { - color: #5c616c; - font-weight: bold; -@@ -929,6 +946,7 @@ StScrollBar { - - .calendar-today, - .calendar-today:active, -+.calendar-today:selected, - .calendar-today:focus, - .calendar-today:hover { - font-weight: bold; -@@ -937,8 +955,8 @@ StScrollBar { - border-width: 0; } - - .calendar-day-with-events { -- color: #5294e2; -- font-weight: bold; } -+ font-weight: bold; -+ background-image: url("common-assets/misc/calendar-today.svg"); } - - .calendar-today.calendar-day-with-events { - color: #ffffff; } -@@ -971,6 +989,9 @@ StScrollBar { - height: 0; } - .message-list-placeholder StLabel { - color: rgba(92, 97, 108, 0.55); } -+ .message-list-clear-button.button { -+ margin: 1.5em 1.5em 0; -+ padding: 4px 12px; } - .message-list-section-close > StIcon { - icon-size: 18px; - border-radius: 0px; -@@ -1001,34 +1022,48 @@ StScrollBar { - .message-icon-bin:rtl { - padding: 8px 8px 8px 0px; } - .message-icon-bin > StIcon { -- icon-size: 32px; } -- .message-secondary-bin { -- color: rgba(92, 97, 108, 0.4); } -- .message-secondary-bin:ltr { -+ color: inherit; } -+ .message-secondary-bin, -+ .message-secondary-bin > .event-time { -+ color: rgba(92, 97, 108, 0.6); -+ font-size: 0.9em; } -+ .message-secondary-bin:ltr, -+ .message-secondary-bin > .event-time:ltr { - padding-left: 8px; } -- .message-secondary-bin:rtl { -+ .message-secondary-bin:rtl, -+ .message-secondary-bin > .event-time:rtl { - padding-right: 8px; } -+ .message:active .message-secondary-bin, -+ .message:active .message-secondary-bin > .event-time { -+ color: rgba(255, 255, 255, 0.6); } - .message-secondary-bin > StIcon { - icon-size: 16px; } - .message-title { -+ color: inherit; - font-weight: bold; - font-size: 1em; - padding: 2px 0 2px 0; } - .message-content { -+ color: inherit; - padding: 8px; - font-size: 1em; } - - .message-media-control { - padding: 6px; -- color: rgba(92, 97, 108, 0.55); } -+ color: #5c616c; } - .message-media-control:last-child:ltr { - padding-right: 18px; } - .message-media-control:last-child:rtl { - padding-left: 18px; } - .message-media-control:hover { -- color: #5c616c; } -+ color: rgba(92, 97, 108, 0.7); } - .message-media-control:active { - color: #5294e2; } -+ .message-media-control:insensitive { -+ color: rgba(92, 97, 108, 0.55); } -+ -+.message:active .message-media-control { -+ color: #ffffff; } - - .media-message-cover-icon { - icon-size: 32px; } -diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss -index 2bc78a4f8..297ea3db1 100644 ---- a/common/gnome-shell/3.18/sass/_common.scss -+++ b/common/gnome-shell/3.18/sass/_common.scss -@@ -1080,15 +1080,17 @@ StScrollBar { - .datemenu-today-button, - .datemenu-displays-box, - .message-list-sections { -- margin: 0 1.5em; -+ margin: 0 0.4em; - } - --.datemenu-calendar-column { spacing: 0.5em; } -+.datemenu-calendar-column { spacing: 0.5em; border: none; } - .datemenu-displays-section { padding-bottom: 3em; } - - .datemenu-today-button, - .world-clocks-button, --.message-list-section-title { -+.weather-button, -+.message-list-section-title, -+.events-section-title { - border-radius: 3px; - padding: .4em; - } -@@ -1103,7 +1105,9 @@ StScrollBar { - - .datemenu-today-button, - .world-clocks-button, --.message-list-section-title { -+.weather-button, -+.message-list-section-title, -+.events-section-title { - padding: 7px 10px 7px 10px; - border: 1px solid transparentize($base_color, 1); - -@@ -1119,12 +1123,15 @@ StScrollBar { - } - - .world-clocks-header, --.message-list-section-title { -+.weather-header, -+.message-list-section-title, -+.events-section-title { - color: transparentize($fg_color, 0.6); - font-weight: bold; - } - --.world-clocks-button:active .world-clocks-header { -+.world-clocks-button:active .world-clocks-header, -+.weather-button:active .weather-header { - color: $selected_fg_color; - } - -@@ -1132,6 +1139,10 @@ StScrollBar { - spacing-rows: 0.4em; - } - -+.weather-box { -+ spacing: 0.4em; -+} -+ - .calendar-month-label { - color: $fg_color; - font-weight: bold; -@@ -1223,6 +1234,7 @@ StScrollBar { - - .calendar-today, - .calendar-today:active, -+.calendar-today:selected, - .calendar-today:focus, - .calendar-today:hover { - font-weight: bold; -@@ -1232,8 +1244,8 @@ StScrollBar { - } - - .calendar-day-with-events { -- color: $selected_bg_color; - font-weight: bold; -+ background-image: url("common-assets/misc/calendar-today.svg"); - } - - .calendar-today.calendar-day-with-events { color: $selected_fg_color; } -@@ -1272,6 +1284,11 @@ StScrollBar { - StLabel { color: $insensitive_fg_color; } - } - -+ &-clear-button.button { -+ margin: 1.5em 1.5em 0; -+ padding: 4px 12px; -+ } -+ - &-section-close { - - > StIcon { -@@ -1315,25 +1332,37 @@ StScrollBar { - - &:rtl { padding: 8px 8px 8px 0px; } - -- > StIcon { icon-size: 32px; } -+ > StIcon { -+ //icon-size: 32px; -+ color: inherit; -+ } - } - -- &-secondary-bin { -- color: transparentize($fg_color, 0.6); -+ &-secondary-bin, -+ &-secondary-bin > .event-time { -+ color: transparentize($fg_color, 0.4); -+ font-size: 0.9em; - - &:ltr { padding-left: 8px; } - &:rtl { padding-right: 8px; } - } - -+ &:active .message-secondary-bin, -+ &:active .message-secondary-bin > .event-time { -+ color: transparentize($selected_fg_color, 0.4); -+ } -+ - &-secondary-bin > StIcon { icon-size: 16px; } - - &-title { -+ color: inherit; - font-weight: bold; - font-size: 1em; - padding: 2px 0 2px 0; - } - - &-content { -+ color: inherit; - padding: 8px; - font-size: 1em; - } -@@ -1341,13 +1370,18 @@ StScrollBar { - - .message-media-control { - padding: 6px; -- color: $insensitive_fg_color; -+ color: $fg_color; - - &:last-child:ltr { padding-right: 18px; } - &:last-child:rtl { padding-left: 18px; } - -- &:hover { color: $fg_color; } -+ &:hover { color: transparentize($fg_color, 0.3); } - &:active { color: $selected_bg_color; } -+ &:insensitive { color: $insensitive_fg_color; } -+} -+ -+.message:active .message-media-control { -+ color: $selected_fg_color; - } - - .media-message-cover-icon { diff --git a/install_dir_solid.patch b/install_dir_solid.patch deleted file mode 100644 index c1e51e8..0000000 --- a/install_dir_solid.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7b1d4f3fb9635c21abc4221c008cfa9849fe53ff Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Wed, 10 May 2017 17:38:54 -0400 -Subject: [PATCH] Append solid suffix to non-transparent variant - -This allows distributions to easily pacakge both without conflicts. -This will also help with Flatpak being able to match the host theme. ---- - common/Makefile.am | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/common/Makefile.am b/common/Makefile.am -index 0421c5de1..58f54d840 100644 ---- a/common/Makefile.am -+++ b/common/Makefile.am -@@ -1,6 +1,12 @@ -+if !ENABLE_TRANSPARENCY -+themedir = $(datadir)/themes/Arc-solid -+themedarkerdir = $(datadir)/themes/Arc-Darker-solid -+themedarkdir = $(datadir)/themes/Arc-Dark-solid -+else - themedir = $(datadir)/themes/Arc - themedarkerdir = $(datadir)/themes/Arc-Darker - themedarkdir = $(datadir)/themes/Arc-Dark -+endif - - ithemedir = $(DESTDIR)$(themedir) - ithemedarkerdir = $(DESTDIR)$(themedarkerdir) diff --git a/remove_margin_auto.patch b/remove_margin_auto.patch deleted file mode 100644 index 6347ed2..0000000 --- a/remove_margin_auto.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4d42137d9e5e262a5544115b543bc69231301781 Mon Sep 17 00:00:00 2001 -From: leigh123linux -Date: Sun, 28 May 2017 08:46:05 +0100 -Subject: [PATCH] remove margin:auto - ---- - common/cinnamon/cinnamon-dark.css | 2 -- - common/cinnamon/cinnamon.css | 2 -- - 2 files changed, 4 deletions(-) - -diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css -index 34f45efad..e26ef0e93 100644 ---- a/common/cinnamon/cinnamon-dark.css -+++ b/common/cinnamon/cinnamon-dark.css -@@ -964,7 +964,6 @@ StScrollBar { - -boxpointer-gap: 5px; } - - .menu-favorites-box { -- margin: auto; - padding: 10px; - transition-duration: 300; - background-color: #383C4A; -@@ -975,7 +974,6 @@ StScrollBar { - border: 1px solid transparent; } - - .menu-places-box { -- margin: auto; - padding: 10px; - border: 0px solid red; } - -diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css -index b816ac32c..f39733b0a 100644 ---- a/common/cinnamon/cinnamon.css -+++ b/common/cinnamon/cinnamon.css -@@ -964,7 +964,6 @@ StScrollBar { - -boxpointer-gap: 5px; } - - .menu-favorites-box { -- margin: auto; - padding: 10px; - transition-duration: 300; - background-color: #F5F6F7; -@@ -975,7 +974,6 @@ StScrollBar { - border: 1px solid transparent; } - - .menu-places-box { -- margin: auto; - padding: 10px; - border: 0px solid red; } - diff --git a/sources b/sources index c2bb864..5368fa4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (arc-theme-20170302.tar.gz) = 99408a7c4db2bd2d81453e308ae5d9bc9bfda4f11e57191936f985de2937debff76c4d1f37a97ac8f5ad3751401ee8ad02457e4558b9c4aedc2bfeba1736ef03 +SHA512 (arc-theme-20181022.tar.gz) = 50337d334f51be6acbeca68b8211b220aefeb513903c73db3a0470430304c8daa238e689488baeeddf639d4c442dd9d423d4d0d3f7def18b21220c485fdbeb0a diff --git a/support_xed.patch b/support_xed.patch index df554ec..ee22ab3 100644 --- a/support_xed.patch +++ b/support_xed.patch @@ -4,213 +4,9 @@ Date: Thu, 1 Jun 2017 17:09:18 +0100 Subject: [PATCH] add support for xed --- - common/gtk-3.0/3.20/gtk-dark.css | 22 +++++++++++++++++++++ - common/gtk-3.0/3.20/gtk-darker.css | 22 +++++++++++++++++++++ - common/gtk-3.0/3.20/gtk-solid-dark.css | 22 +++++++++++++++++++++ - common/gtk-3.0/3.20/gtk-solid-darker.css | 22 +++++++++++++++++++++ - common/gtk-3.0/3.20/gtk-solid.css | 22 +++++++++++++++++++++ - common/gtk-3.0/3.20/gtk.css | 22 +++++++++++++++++++++ common/gtk-3.0/3.20/sass/_applications.scss | 30 +++++++++++++++++++++++++++++ 7 files changed, 162 insertions(+) -diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css -index 4dbab19b2..f3b59cf00 100644 ---- a/common/gtk-3.0/3.20/gtk-dark.css -+++ b/common/gtk-3.0/3.20/gtk-dark.css -@@ -3230,6 +3230,28 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can - border-bottom: none; - border-radius: 0; } - -+.xed-window .xed-panel.side .notebook tab.top { -+ padding: 8px 12px; } -+ -+.xed-window .xed-panel.bottom .notebook.frame { -+ border: none; } -+ -+.xed-window .small-button { -+ padding: 2px 4px; } -+ -+.xed-window .xed-statusbar, -+.xed-window .xed-searchbar { -+ border: 0px solid #2b2e39; -+ border-top-width: 1px; } -+ -+.xed-window .xed-goto-line-box { -+ background-color: #3c4150; -+ padding: 6px; -+ border-color: #2b2e39; -+ border-radius: 0 0 2px 2px; -+ border-width: 0 1px 1px 1px; -+ border-style: solid; } -+ - .gb-search-entry-occurrences-tag { - background: none; } - -diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css -index 1ab51899f..aa29e3bc0 100644 ---- a/common/gtk-3.0/3.20/gtk-darker.css -+++ b/common/gtk-3.0/3.20/gtk-darker.css -@@ -3229,6 +3229,28 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can - border-bottom: none; - border-radius: 0; } - -+.xed-window .xed-panel.side .notebook tab.top { -+ padding: 8px 12px; } -+ -+.xed-window .xed-panel.bottom .notebook.frame { -+ border: none; } -+ -+.xed-window .small-button { -+ padding: 2px 4px; } -+ -+.xed-window .xed-statusbar, -+.xed-window .xed-searchbar { -+ border: 0px solid #dcdfe3; -+ border-top-width: 1px; } -+ -+.xed-window .xed-goto-line-box { -+ background-color: #fbfbfc; -+ padding: 6px; -+ border-color: #dcdfe3; -+ border-radius: 0 0 2px 2px; -+ border-width: 0 1px 1px 1px; -+ border-style: solid; } -+ - .gb-search-entry-occurrences-tag { - background: none; } - -diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css -index 6ee77c390..d5ea665af 100644 ---- a/common/gtk-3.0/3.20/gtk-solid-dark.css -+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css -@@ -3230,6 +3230,28 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can - border-bottom: none; - border-radius: 0; } - -+.xed-window .xed-panel.side .notebook tab.top { -+ padding: 8px 12px; } -+ -+.xed-window .xed-panel.bottom .notebook.frame { -+ border: none; } -+ -+.xed-window .small-button { -+ padding: 2px 4px; } -+ -+.xed-window .xed-statusbar, -+.xed-window .xed-searchbar { -+ border: 0px solid #2b2e39; -+ border-top-width: 1px; } -+ -+.xed-window .xed-goto-line-box { -+ background-color: #3c4150; -+ padding: 6px; -+ border-color: #2b2e39; -+ border-radius: 0 0 2px 2px; -+ border-width: 0 1px 1px 1px; -+ border-style: solid; } -+ - .gb-search-entry-occurrences-tag { - background: none; } - -diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css -index ffbf78f00..8a4eacc0e 100644 ---- a/common/gtk-3.0/3.20/gtk-solid-darker.css -+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css -@@ -3229,6 +3229,28 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can - border-bottom: none; - border-radius: 0; } - -+.xed-window .xed-panel.side .notebook tab.top { -+ padding: 8px 12px; } -+ -+.xed-window .xed-panel.bottom .notebook.frame { -+ border: none; } -+ -+.xed-window .small-button { -+ padding: 2px 4px; } -+ -+.xed-window .xed-statusbar, -+.xed-window .xed-searchbar { -+ border: 0px solid #dcdfe3; -+ border-top-width: 1px; } -+ -+.xed-window .xed-goto-line-box { -+ background-color: #fbfbfc; -+ padding: 6px; -+ border-color: #dcdfe3; -+ border-radius: 0 0 2px 2px; -+ border-width: 0 1px 1px 1px; -+ border-style: solid; } -+ - .gb-search-entry-occurrences-tag { - background: none; } - -diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css -index 2ddb1035e..4b5fb34fc 100644 ---- a/common/gtk-3.0/3.20/gtk-solid.css -+++ b/common/gtk-3.0/3.20/gtk-solid.css -@@ -3233,6 +3233,28 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can - border-bottom: none; - border-radius: 0; } - -+.xed-window .xed-panel.side .notebook tab.top { -+ padding: 8px 12px; } -+ -+.xed-window .xed-panel.bottom .notebook.frame { -+ border: none; } -+ -+.xed-window .small-button { -+ padding: 2px 4px; } -+ -+.xed-window .xed-statusbar, -+.xed-window .xed-searchbar { -+ border: 0px solid #dcdfe3; -+ border-top-width: 1px; } -+ -+.xed-window .xed-goto-line-box { -+ background-color: #fbfbfc; -+ padding: 6px; -+ border-color: #dcdfe3; -+ border-radius: 0 0 2px 2px; -+ border-width: 0 1px 1px 1px; -+ border-style: solid; } -+ - .gb-search-entry-occurrences-tag { - background: none; } - -diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css -index 999e54ad3..ccb90b2ad 100644 ---- a/common/gtk-3.0/3.20/gtk.css -+++ b/common/gtk-3.0/3.20/gtk.css -@@ -3233,6 +3233,28 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can - border-bottom: none; - border-radius: 0; } - -+.xed-window .xed-panel.side .notebook tab.top { -+ padding: 8px 12px; } -+ -+.xed-window .xed-panel.bottom .notebook.frame { -+ border: none; } -+ -+.xed-window .small-button { -+ padding: 2px 4px; } -+ -+.xed-window .xed-statusbar, -+.xed-window .xed-searchbar { -+ border: 0px solid #dcdfe3; -+ border-top-width: 1px; } -+ -+.xed-window .xed-goto-line-box { -+ background-color: #fbfbfc; -+ padding: 6px; -+ border-color: #dcdfe3; -+ border-radius: 0 0 2px 2px; -+ border-width: 0 1px 1px 1px; -+ border-style: solid; } -+ - .gb-search-entry-occurrences-tag { - background: none; } - diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss index 99c033498..1b3ae2fff 100644 --- a/common/gtk-3.0/3.20/sass/_applications.scss diff --git a/update_readme.patch b/update_readme.patch deleted file mode 100644 index 4ae48dd..0000000 --- a/update_readme.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 8290cb813f157a22e64ae58ac3dfb5983b0416e6 Mon Sep 17 00:00:00 2001 -From: Horst3180 -Date: Fri, 12 May 2017 17:52:43 +0200 -Subject: [PATCH] update README.md - ---- - README.md | 22 +++++++++++++--------- - 1 file changed, 13 insertions(+), 9 deletions(-) - -diff --git a/README.md b/README.md -index 16305416e..9ffa7bdad 100644 ---- a/README.md -+++ b/README.md -@@ -46,16 +46,16 @@ A non-transparent version of the theme is available here: [Arc Solid OBS repo](h - To build the theme the follwing packages are required - * `autoconf` - * `automake` --* `pkg-config` or `pkgconfig` if you use Fedora -+* `pkg-config` or `pkgconfig` for Fedora - * `libgtk-3-dev` for Debian based distros or `gtk3-devel` for RPM based distros --* `git` if you want to clone the source directory -+* `git` to clone the source directory - --**Note:** If your distribution doesn't ship separate development packages you just need GTK 3 instead of the `-dev` packages. -+**Note:** For distributions which don't ship separate development packages, just the GTK 3 package is needed instead of the `-dev` packages. - - For the theme to function properly, install the following --* GNOME Shell, GTK 3.14 - 3.22 -+* GNOME Shell 3.14 - 3.24, GTK 3.14 - 3.22 - * The `gnome-themes-standard` package --* The murrine engine. This has different names depending on your distro. -+* The murrine engine. This has different names depending on the distro. - * `gtk-engine-murrine` (Arch Linux) - * `gtk2-engines-murrine` (Debian, Ubuntu, elementary OS) - * `gtk-murrine-engine` (Fedora) -@@ -89,11 +89,15 @@ Other options to pass to autogen.sh are - --disable-unity disable Unity support - --disable-xfwm disable XFWM support - -- --with-gnome= build the theme for a specific GNOME version (3.14, 3.16, 3.18, 3.20) -- Note: Normally the correct version is detected automatically and this -+ --with-gnome= build the theme for a specific GNOME version (3.14, 3.16, 3.18, 3.20, 3.22) -+ Note 1: Normally the correct version is detected automatically and this - option should not be needed. -+ Note 2: For GNOME 3.24, use --with-gnome-version=3.22 -+ (this works for now, the build system will be improved in the future) - --After the installation is complete you can activate the theme with `gnome-tweak-tool` or a similar program by selecting `Arc`, `Arc-Darker` or `Arc-Dark` as Window/GTK+ theme and `Arc` or `Arc-Dark` as GNOME Shell/Cinnamon theme. -+After the installation is complete the theme can be activated with `gnome-tweak-tool` or a similar program by selecting `Arc`, `Arc-Darker` or `Arc-Dark` as Window/GTK+ theme and `Arc` or `Arc-Dark` as GNOME Shell/Cinnamon theme. -+ -+If the `--disable-transparency` option was used, the theme will be installed as `Arc-solid`, `Arc-Darker-solid` and `Arc-Dark-solid`. - - ## Uninstall - -@@ -128,7 +132,7 @@ The Arc Dark theme for the Ubuntu Software Center by [mervick](https://github.co - - ## Troubleshooting - --If you have Ubuntu with a newer GTK/GNOME version than the one included by default (i.e Ubuntu 14.04 with GTK 3.14 or Ubuntu 15.04 with GTK 3.16, etc.) the prebuilt packages won't work properly and you have to install the theme manually as described above. -+If you use Ubuntu with a newer GTK/GNOME version than the one included by default (i.e Ubuntu 14.04 with GTK 3.14 or Ubuntu 15.04 with GTK 3.16, etc.) the prebuilt packages won't work properly and the theme has to be installed manually as described above. - This is also true for other distros with a different GTK/GNOME version than the one included by default - - --