From 530569a77116439be29ea9150419ce0a10534258 Mon Sep 17 00:00:00 2001 From: Daniil Zhilin Date: Mon, 9 Jan 2017 17:41:26 +0300 Subject: [PATCH 01/12] Correct capitalization --- HACKING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HACKING.md b/HACKING.md index f02a426..efea8b6 100644 --- a/HACKING.md +++ b/HACKING.md @@ -24,7 +24,7 @@ This theme uses node-sass/libsass to process the various .scss files. Never edit * `main.rc` contains the major part of the theme -* `panel.rc` contains the panel styling for XFCE and Mate +* `panel.rc` contains the panel styling for Xfce and MATE * `apps.rc` contains some application specific rules From ef20dcdc64523f0ff58e8555a0a060643f91cf48 Mon Sep 17 00:00:00 2001 From: Daniil Zhilin Date: Mon, 9 Jan 2017 17:46:41 +0300 Subject: [PATCH 02/12] Correct capitalization --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e2ff565..efd5194 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Arc Theme -Arc is a flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell which supports GTK 3 and GTK 2 based desktop environments like Gnome, Unity, Budgie, Pantheon, XFCE, Mate, etc. +Arc is a flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments like GNOME, Unity, Budgie, Pantheon, Xfce, MATE, etc. ## Arc is available in three variants @@ -27,7 +27,7 @@ Arc is a flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell w | Debian Testing/Unstable | `arc-theme` | | Fedora | [OBS Repo][obs-repo] | | Gentoo/Funtoo | `x11-themes/arc-theme` from the [Scriptkitties Overlay][sk-overlay] | -| Open SUSE | [OBS Repo][obs-repo] | +| openSUSE | [OBS Repo][obs-repo] | | Solus | `arc-gtk-theme` | | Ubuntu 15.04 - 16.04 | [OBS Repo][obs-repo] | | Ubuntu 16.10 | `arc-theme` | @@ -52,7 +52,7 @@ To build the theme the follwing packages are required **Note:** If your distribution doesn't ship separate development packages you just need GTK 3 instead of the `-dev` packages. For the theme to function properly, install the following -* Gnome Shell, GTK 3.14 - 3.22 +* GNOME Shell, GTK 3.14 - 3.22 * The `gnome-themes-standard` package * The murrine engine. This has different names depending on your distro. * `gtk-engine-murrine` (Arch Linux) @@ -88,11 +88,11 @@ 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) + --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 option should not be needed. -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 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. ## Uninstall @@ -124,8 +124,8 @@ 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. -This is also true for other distros with a different GTK/Gnome version than the one included by default +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. +This is also true for other distros with a different GTK/GNOME version than the one included by default -- From 7e3043fe3c2952a3750d29ef4b6dba5ff92edd3d Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sat, 21 Jan 2017 13:36:43 +0100 Subject: [PATCH 03/12] add official fedora package name to readme (fix #726) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index efd5194..8ab66e7 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Arc is a flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell w | Arch Linux | `arc-gtk-theme`, [`gtk-theme-arc-git`](https://aur.archlinux.org/packages/gtk-theme-arc-git) (AUR) | | Debian 8 | [OBS Repo][obs-repo] | | Debian Testing/Unstable | `arc-theme` | -| Fedora | [OBS Repo][obs-repo] | +| Fedora | `arc-theme` or [OBS Repo][obs-repo] (will be removed soon) | | Gentoo/Funtoo | `x11-themes/arc-theme` from the [Scriptkitties Overlay][sk-overlay] | | openSUSE | [OBS Repo][obs-repo] | | Solus | `arc-gtk-theme` | From 78dd4ddae35ed0c21e458efcaeedaf4017e437f3 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sat, 21 Jan 2017 13:40:17 +0100 Subject: [PATCH 04/12] update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8ab66e7..b674c64 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,8 @@ Arc is a flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell w | Arch Linux | `arc-gtk-theme`, [`gtk-theme-arc-git`](https://aur.archlinux.org/packages/gtk-theme-arc-git) (AUR) | | Debian 8 | [OBS Repo][obs-repo] | | Debian Testing/Unstable | `arc-theme` | -| Fedora | `arc-theme` or [OBS Repo][obs-repo] (will be removed soon) | +| Fedora 21 - 23 | [OBS Repo][obs-repo] | +| Fedora 24 -25 | `arc-theme` | | Gentoo/Funtoo | `x11-themes/arc-theme` from the [Scriptkitties Overlay][sk-overlay] | | openSUSE | [OBS Repo][obs-repo] | | Solus | `arc-gtk-theme` | From 0af4e07f1b35a8dfae9af6a2722060045c356972 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sat, 21 Jan 2017 13:43:35 +0100 Subject: [PATCH 05/12] add link to Arc KDE to README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b674c64..1630541 100644 --- a/README.md +++ b/README.md @@ -107,6 +107,9 @@ from the cloned git repository, or ## Extras +### Arc KDE +A port of Arc for the Plasma 5 desktop with a few additions and extras. Available [here](https://github.com/PapirusDevelopmentTeam/arc-kde). + ### Arc Firefox theme A theme for Firefox is available at https://github.com/horst3180/arc-firefox-theme From 0df7eae3f8e9fd1ecc954192f31b88b245dccc63 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sun, 29 Jan 2017 09:39:48 +0000 Subject: [PATCH 06/12] fix missing gradient warning --- common/cinnamon/cinnamon-dark.css | 10 +++++----- common/cinnamon/cinnamon.css | 10 +++++----- common/cinnamon/sass/_common.scss | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css index 488f54b..34f45ef 100644 --- a/common/cinnamon/cinnamon-dark.css +++ b/common/cinnamon/cinnamon-dark.css @@ -351,11 +351,11 @@ StScrollBar { spacing: 1em; } .popup-separator-menu-item { - height: 2px; - margin: 10px 0px; - background-color: transparent; - border: none; - border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } + -gradient-height: 2px; + -gradient-start: transparent; + -gradient-end: transparent; + -margin-horizontal: 1.5em; + height: 1em; } .popup-alternating-menu-item:alternate { font-weight: normal; } diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css index 036f39d..b816ac3 100644 --- a/common/cinnamon/cinnamon.css +++ b/common/cinnamon/cinnamon.css @@ -351,11 +351,11 @@ StScrollBar { spacing: 1em; } .popup-separator-menu-item { - height: 2px; - margin: 10px 0px; - background-color: transparent; - border: none; - border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } + -gradient-height: 2px; + -gradient-start: transparent; + -gradient-end: transparent; + -margin-horizontal: 1.5em; + height: 1em; } .popup-alternating-menu-item:alternate { font-weight: normal; } diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss index 51dd4bc..00af8f7 100644 --- a/common/cinnamon/sass/_common.scss +++ b/common/cinnamon/sass/_common.scss @@ -334,11 +334,11 @@ StScrollBar { .popup-combobox-item { spacing: 1em; } .popup-separator-menu-item { - height: 2px; //not really the whole box - margin: 10px 0px; - background-color: transparent; - border: none; - border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; + -gradient-height: 2px; + -gradient-start: transparent; + -gradient-end: transparent; + -margin-horizontal: 1.5em; + height: 1em; } .popup-alternating-menu-item:alternate { From e411c4b50dfac81e72f119ee05590303b524263c Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 2 Mar 2017 17:44:25 +0100 Subject: [PATCH 07/12] gtk 3.22: fix frame borders (#742) --- common/gtk-3.0/3.20/gtk-dark.css | 8 +++++--- common/gtk-3.0/3.20/gtk-darker.css | 8 +++++--- common/gtk-3.0/3.20/gtk-solid-dark.css | 8 +++++--- common/gtk-3.0/3.20/gtk-solid-darker.css | 8 +++++--- common/gtk-3.0/3.20/gtk-solid.css | 8 +++++--- common/gtk-3.0/3.20/gtk.css | 8 +++++--- common/gtk-3.0/3.20/sass/_common.scss | 6 +++++- 7 files changed, 35 insertions(+), 19 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 7b6308c..6d6b5d9 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -2326,9 +2326,11 @@ frame > border, padding: 0; border-radius: 0; border: 1px solid #2b2e39; } - frame > border.flat, - .frame.flat { - border-style: none; } + +frame.flat > border, +frame > border.flat, +.frame.flat { + border-style: none; } scrolledwindow viewport.frame { border-style: none; } diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 5d7d54c..0572b52 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -2325,9 +2325,11 @@ frame > border, padding: 0; border-radius: 0; border: 1px solid #dcdfe3; } - frame > border.flat, - .frame.flat { - border-style: none; } + +frame.flat > border, +frame > border.flat, +.frame.flat { + border-style: none; } scrolledwindow viewport.frame { border-style: 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 747f10a..6c3eed0 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -2326,9 +2326,11 @@ frame > border, padding: 0; border-radius: 0; border: 1px solid #2b2e39; } - frame > border.flat, - .frame.flat { - border-style: none; } + +frame.flat > border, +frame > border.flat, +.frame.flat { + border-style: none; } scrolledwindow viewport.frame { border-style: 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 2db3fe2..38b63ba 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -2325,9 +2325,11 @@ frame > border, padding: 0; border-radius: 0; border: 1px solid #dcdfe3; } - frame > border.flat, - .frame.flat { - border-style: none; } + +frame.flat > border, +frame > border.flat, +.frame.flat { + border-style: none; } scrolledwindow viewport.frame { border-style: none; } diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 99dbe13..85d62d0 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -2329,9 +2329,11 @@ frame > border, padding: 0; border-radius: 0; border: 1px solid #dcdfe3; } - frame > border.flat, - .frame.flat { - border-style: none; } + +frame.flat > border, +frame > border.flat, +.frame.flat { + border-style: none; } scrolledwindow viewport.frame { border-style: none; } diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index ebf8827..8438853 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -2329,9 +2329,11 @@ frame > border, padding: 0; border-radius: 0; border: 1px solid #dcdfe3; } - frame > border.flat, - .frame.flat { - border-style: none; } + +frame.flat > border, +frame > border.flat, +.frame.flat { + border-style: none; } scrolledwindow viewport.frame { border-style: none; } diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 9671ae6..3397c8c 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -2402,8 +2402,12 @@ frame > border, padding: 0; border-radius: 0; border: 1px solid $borders_color; +} - &.flat { border-style: none; } +frame.flat > border, +frame > border.flat, +.frame.flat { + border-style: none; } scrolledwindow { From 947a0adee3096e56f45d5fb12e84c41f80280abc Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 2 Mar 2017 18:23:37 +0100 Subject: [PATCH 08/12] fix asymmetric circular buttons (fix #728) --- common/gtk-3.0/3.20/gtk-dark.css | 5 +++-- common/gtk-3.0/3.20/gtk-darker.css | 5 +++-- common/gtk-3.0/3.20/gtk-solid-dark.css | 5 +++-- common/gtk-3.0/3.20/gtk-solid-darker.css | 5 +++-- common/gtk-3.0/3.20/gtk-solid.css | 5 +++-- common/gtk-3.0/3.20/gtk.css | 5 +++-- common/gtk-3.0/3.20/sass/_common.scss | 5 +++-- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 6d6b5d9..18c1e93 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -2829,8 +2829,9 @@ popover.background.touch-selection, .csd popover.background.touch-selection { button.circular, button.nautilus-circular-button.image-button, button.circular-button { padding: 0; - min-width: 26px; - min-height: 26px; + min-width: 16px; + min-height: 24px; + padding: 2px 6px; border-radius: 50%; -gtk-outline-radius: 50%; } button.circular label, button.nautilus-circular-button.image-button label, diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 0572b52..b7803e1 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -2828,8 +2828,9 @@ popover.background.touch-selection, .csd popover.background.touch-selection { button.circular, button.nautilus-circular-button.image-button, button.circular-button { padding: 0; - min-width: 26px; - min-height: 26px; + min-width: 16px; + min-height: 24px; + padding: 2px 6px; border-radius: 50%; -gtk-outline-radius: 50%; } button.circular label, button.nautilus-circular-button.image-button label, 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 6c3eed0..b218649 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -2829,8 +2829,9 @@ popover.background.touch-selection, .csd popover.background.touch-selection { button.circular, button.nautilus-circular-button.image-button, button.circular-button { padding: 0; - min-width: 26px; - min-height: 26px; + min-width: 16px; + min-height: 24px; + padding: 2px 6px; border-radius: 50%; -gtk-outline-radius: 50%; } button.circular label, button.nautilus-circular-button.image-button label, 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 38b63ba..069a37c 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -2828,8 +2828,9 @@ popover.background.touch-selection, .csd popover.background.touch-selection { button.circular, button.nautilus-circular-button.image-button, button.circular-button { padding: 0; - min-width: 26px; - min-height: 26px; + min-width: 16px; + min-height: 24px; + padding: 2px 6px; border-radius: 50%; -gtk-outline-radius: 50%; } button.circular label, button.nautilus-circular-button.image-button label, diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 85d62d0..34bc897 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -2832,8 +2832,9 @@ popover.background.touch-selection, .csd popover.background.touch-selection { button.circular, button.nautilus-circular-button.image-button, button.circular-button { padding: 0; - min-width: 26px; - min-height: 26px; + min-width: 16px; + min-height: 24px; + padding: 2px 6px; border-radius: 50%; -gtk-outline-radius: 50%; } button.circular label, button.nautilus-circular-button.image-button label, diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 8438853..3f5eafb 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -2832,8 +2832,9 @@ popover.background.touch-selection, .csd popover.background.touch-selection { button.circular, button.nautilus-circular-button.image-button, button.circular-button { padding: 0; - min-width: 26px; - min-height: 26px; + min-width: 16px; + min-height: 24px; + padding: 2px 6px; border-radius: 50%; -gtk-outline-radius: 50%; } button.circular label, button.nautilus-circular-button.image-button label, diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 3397c8c..8f97699 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -3031,8 +3031,9 @@ colorchooser .popover.osd { border-radius: 3px; } button.circular, button.circular-button { padding: 0; - min-width: 26px; - min-height: 26px; + min-width: 16px; + min-height: 24px; + padding: 2px 6px; border-radius: 50%; -gtk-outline-radius: 50%; From 766ae1a386134f122bab4a0456af802e7a5b66bd Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 2 Mar 2017 19:02:12 +0100 Subject: [PATCH 09/12] fix atril toolbar background (fix #741) --- common/gtk-3.0/3.20/gtk-dark.css | 3 +++ common/gtk-3.0/3.20/gtk-darker.css | 3 +++ common/gtk-3.0/3.20/gtk-solid-dark.css | 3 +++ common/gtk-3.0/3.20/gtk-solid-darker.css | 3 +++ common/gtk-3.0/3.20/gtk-solid.css | 3 +++ common/gtk-3.0/3.20/gtk.css | 3 +++ common/gtk-3.0/3.20/sass/_applications.scss | 7 +++++++ 7 files changed, 25 insertions(+) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 18c1e93..4dbab19 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -3404,6 +3404,9 @@ button.documents-favorite:active:hover { .tr-workarea overshoot { border-color: transparent; } +.atril-window .primary-toolbar toolbar, .atril-window .primary-toolbar .inline-toolbar { + background: none; } + #gf-bubble, #gf-bubble.solid, #gf-osd-window, #gf-osd-window.solid, diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index b7803e1..1ab5189 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -3403,6 +3403,9 @@ button.documents-favorite:active:hover { .tr-workarea overshoot { border-color: transparent; } +.atril-window .primary-toolbar toolbar, .atril-window .primary-toolbar .inline-toolbar { + background: none; } + #gf-bubble, #gf-bubble.solid, #gf-osd-window, #gf-osd-window.solid, 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 b218649..6ee77c3 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -3404,6 +3404,9 @@ button.documents-favorite:active:hover { .tr-workarea overshoot { border-color: transparent; } +.atril-window .primary-toolbar toolbar, .atril-window .primary-toolbar .inline-toolbar { + background: none; } + #gf-bubble, #gf-bubble.solid, #gf-osd-window, #gf-osd-window.solid, 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 069a37c..ffbf78f 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -3403,6 +3403,9 @@ button.documents-favorite:active:hover { .tr-workarea overshoot { border-color: transparent; } +.atril-window .primary-toolbar toolbar, .atril-window .primary-toolbar .inline-toolbar { + background: none; } + #gf-bubble, #gf-bubble.solid, #gf-osd-window, #gf-osd-window.solid, diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 34bc897..2ddb103 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -3407,6 +3407,9 @@ button.documents-favorite:active:hover { .tr-workarea overshoot { border-color: transparent; } +.atril-window .primary-toolbar toolbar, .atril-window .primary-toolbar .inline-toolbar { + background: none; } + #gf-bubble, #gf-bubble.solid, #gf-osd-window, #gf-osd-window.solid, diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 3f5eafb..999e54a 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -3407,6 +3407,9 @@ button.documents-favorite:active:hover { .tr-workarea overshoot { border-color: transparent; } +.atril-window .primary-toolbar toolbar, .atril-window .primary-toolbar .inline-toolbar { + background: none; } + #gf-bubble, #gf-bubble.solid, #gf-osd-window, #gf-osd-window.solid, diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss index 9697e9d..99c0334 100644 --- a/common/gtk-3.0/3.20/sass/_applications.scss +++ b/common/gtk-3.0/3.20/sass/_applications.scss @@ -517,6 +517,13 @@ button.documents-favorite:active:hover { border-color: transparent; // Remove black border on over- and undershoot } +// +// Atril (MATE pdf viewer) +// +.atril-window .primary-toolbar toolbar { + background: none; +} + // // Gnome Flashback // From 7b1d4f3fb9635c21abc4221c008cfa9849fe53ff Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Wed, 10 May 2017 17:38:54 -0400 Subject: [PATCH 10/12] 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 0421c5d..58f54d8 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) From 4b75f33ff2cfedb6ba0809cf877deb2d2831e6c3 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 12 May 2017 17:11:09 +0200 Subject: [PATCH 11/12] gnome-shell 3.24 fixes --- .../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 0000000..b5a41f6 --- /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 db3555a..69438bb 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 45b2d1d..5d8c325 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 2bc78a4..297ea3d 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 { From 8290cb813f157a22e64ae58ac3dfb5983b0416e6 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 12 May 2017 17:52:43 +0200 Subject: [PATCH 12/12] update README.md --- README.md | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1630541..9ffa7bd 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 --