Merge lp:~bjoern-michaelsen/ubuntu-themes/libreoffice-toolbars-320 into lp:ubuntu-themes

[Björn Michaelsen]

fix gtk3 toolbar theming for LibreOffice (LP: #1580537)

Fix theming of LibreOffice toolbar with gtk-3.20 (needs a patch for LibreOffice too).

[Iain Lane (laney)]

looks like this can only possibly break LO, so fine by me ;-)

thanks!

review: Approve

[Iain Lane (laney)]

if you would be so kind as to test https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-1903/+packages when it builds

[Iain Lane (laney)]

ping?

[Iain Lane (laney)]

I'm going to publish since it's User Interface Freeze today, but please check.

=== added file 'Ambiance/gtk-3.20/apps/libreoffice.css'
--- Ambiance/gtk-3.20/apps/libreoffice.css	1970-01-01 00:00:00 +0000
+++ Ambiance/gtk-3.20/apps/libreoffice.css	2016-08-30 10:39:35 +0000
@@ -0,0 +1,17 @@
+.libreoffice-toolbar {
+    background-image: none;
+}
+.libreoffice-toolbar button:hover {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@focus_color, 1.5)),
+                                     color-stop (0.5, shade (@focus_color, 1.33)),
+                                     to (shade (@focus_color, 1.28)));
+    border-image-source: url("assets/button-hover.png");
+}
+.libreoffice-toolbar button:active {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@selected_bg_color, 1.5)),
+                                     color-stop (0.5, shade (@selected_bg_color, 1.33)),
+                                     to (shade (@selected_bg_color, 1.28)));
+    border-image-source: url("assets/button-active-hover.png");
+}
 
=== modified file 'Ambiance/gtk-3.20/gtk-main.css'
--- Ambiance/gtk-3.20/gtk-main.css	2016-08-27 14:04:48 +0000
+++ Ambiance/gtk-3.20/gtk-main.css	2016-08-30 10:39:35 +0000
@@ -81,4 +81,5 @@
 @import url("apps/unity-greeter.css");
 @import url("apps/software-center.css");
 @import url("apps/calendar.css");
+@import url("apps/libreoffice.css");
 @import url("public-colors.css");
 
=== added file 'Radiance/gtk-3.20/apps/libreoffice.css'
--- Radiance/gtk-3.20/apps/libreoffice.css	1970-01-01 00:00:00 +0000
+++ Radiance/gtk-3.20/apps/libreoffice.css	2016-08-30 10:39:35 +0000
@@ -0,0 +1,17 @@
+.libreoffice-toolbar {
+    background-image: none;
+}
+.libreoffice-toolbar button:hover {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@focus_color, 1.5)),
+                                     color-stop (0.5, shade (@focus_color, 1.33)),
+                                     to (shade (@focus_color, 1.28)));
+    border-image-source: url("assets/button-hover.png");
+}
+.libreoffice-toolbar button:active {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@selected_bg_color, 1.5)),
+                                     color-stop (0.5, shade (@selected_bg_color, 1.33)),
+                                     to (shade (@selected_bg_color, 1.28)));
+    border-image-source: url("assets/button-active-hover.png");
+}
 
=== modified file 'Radiance/gtk-3.20/gtk-main.css'
--- Radiance/gtk-3.20/gtk-main.css	2016-08-27 14:04:48 +0000
+++ Radiance/gtk-3.20/gtk-main.css	2016-08-30 10:39:35 +0000
@@ -83,4 +83,5 @@
 @import url("apps/gnome-terminal.css");
 @import url("apps/software-center.css");
 @import url("apps/calendar.css");
+@import url("apps/libreoffice.css");
 @import url("public-colors.css");
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-08-29 18:42:30 +0000
+++ debian/changelog	2016-08-30 10:39:35 +0000
@@ -1,3 +1,9 @@
+ubuntu-themes (16.10+16.10.20160829.3-0ubuntu2) yakkety; urgency=medium
+
+  * fix gtk3 toolbar theming for LibreOffice (LP: #1580537)
+
+ -- Bjoern Michaelsen <[e-mail]>  Tue, 30 Aug 2016 11:40:49 +0200
+
 ubuntu-themes (16.10+16.10.20160829.3-0ubuntu1) yakkety; urgency=medium
 
   [ Alberts Muktupāvels ]