Merge lp:~c-lobrano/ubuntu-themes/fix-1704745 into lp:ubuntu-themes

[Carlo Lobrano]

Fix Libreoffice close button style

In both Ambiance and Radiance, the Libreoffice's close button
on the tob right corner (below the windows's close button) has
a different color respect the menu bar in which is placed.

This commit fixes close button color and background in normal,
unfocused and hover state.

[Marco Trevisan (Treviño) (3v1n0)]

I'm sorry we can't apply this as it's too generic and it breaks (for example) gitg commit message.

I don't think we can't do much here until libreoffice doesn't add a (parent, at least) widget with its class name

review: Needs Fixing

[Carlo Lobrano (c-lobrano)]

Oh, I see, that's a pity

[Adolfo Jayme Barrientos (fitojb)]

Is the LibreOffice issue reported upstream? If not, please do :) See https://bugs.documentfoundation.org/show_bug.cgi?id=GTK3

[Carlo Lobrano (c-lobrano)]

Hi Adolfo,

it doesn't seem necessary anymore, it is not reproducible anymore in LibreOffice 5.4

[Marco Trevisan (Treviño) (3v1n0)]

I think the main issue here is still the fact that the selector is too general and also other apps might be affected by change.

[Carlo Lobrano (c-lobrano)]

I see, thanks for the new review anyway. If I'll reproduce the bug on the new LibreOffice 5.4, I'll open a bug upstream, then.

Unmerged revisions

556. By Carlo Lobrano on 2017-08-30

Fix LibreOffice close button style

improved previous fix, using a rule more specific that (should)
avoid to break other applications (e.g. gitg).

This commit makes the background and foreground color of the
LibreOffice's close button on the top right corner matching
with the adiacent menubar.

Fixes LP:1704745

555. By Carlo Lobrano on 2017-08-30

Update from mainline

554. By Carlo Lobrano on 2017-07-18

Fix Libreoffice close button style

In both Ambiance and Radiance, the Libreoffice's close button
on the tob right corner (below the windows's close button) has
a different color respect the menu bar in which is placed.

This commit fixes close button color and background in normal,
unfocused and hover state.

Fixes LP:1704745

=== modified file 'Ambiance/gtk-3.20/apps/libreoffice.css'
--- Ambiance/gtk-3.20/apps/libreoffice.css	2016-10-06 18:53:39 +0000
+++ Ambiance/gtk-3.20/apps/libreoffice.css	2017-08-30 14:15:00 +0000
@@ -1,7 +1,7 @@
 .libreoffice-toolbar {
     background-image: none;
     border: none;
-    box-shadow: none;    
+    box-shadow: none;
 }
 .libreoffice-toolbar button:hover {
     background-image: -gtk-gradient (linear, left top, left bottom,
@@ -17,3 +17,21 @@
                                      to (shade (@selected_bg_color, 1.28)));
     border-image-source: url("assets/button-active-hover.png");
 }
+
+/* 'close' button */
+window > decoration ~ grid.horizontal > grid.horizontal {
+	background-color: @dark_bg_color;
+}
+
+window > grid > grid > menubar + button.flat.small-button {
+	background-color: @dark_bg_color;
+	color: @dark_fg_color;
+}
+
+window > grid > grid > menubar + button.flat.small-button:backdrop {
+	color: @theme_unfocused_fg_color;
+}
+
+window > grid > grid > menubar + button.flat.small-button:hover {
+	color: @dark_bg_color;
+}
 
=== modified file 'Radiance/gtk-3.20/apps/libreoffice.css'
--- Radiance/gtk-3.20/apps/libreoffice.css	2016-10-06 18:53:39 +0000
+++ Radiance/gtk-3.20/apps/libreoffice.css	2017-08-30 14:15:00 +0000
@@ -17,3 +17,22 @@
                                      to (shade (@selected_bg_color, 1.28)));
     border-image-source: url("assets/button-active-hover.png");
 }
+
+/* 'close' button */
+window > decoration ~ grid.horizontal > grid.horizontal {
+	background-color: @dark_bg_color;
+}
+
+window > grid > grid > menubar + button.flat.small-button {
+	background-color: @dark_bg_color;
+	color: @dark_fg_color;
+}
+
+window > grid > grid > menubar + button.flat.small-button:backdrop {
+	color: @theme_unfocused_fg_color;
+}
+
+window > grid > grid > menubar + button.flat.small-button:hover {
+    background-color: @dark_bg_color;
+	color: @dark_fg_color;
+}