Merge lp:~flexiondotorg/ubuntu-themes/lp1624571 into lp:ubuntu-themes

[Martin Wimpress]

Fix borders of Libreoffice toolbars, so that they don't overlap the window decorations

There is an unnecessary light coloured border around the LibreOffice toolbars.

LibreOffice uses styling from GTK_STYLE_CLASS_PRIMARY_TOOLBAR and GTK_STYLE_CLASS_TOOLBAR in addition to .libreoffice-toolbar that was added in this patch:

  * https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice/tree/patches/gtk3-toolbar-styleclass.diff?h=ubuntu-yakkety-5.2

This merge proposal excludes .libreoffice-toolbar from .primary-toolbar so that only the .libreoffice-toolbar styling from gtk-3.20/apps/libreoffice.css is applied.

  * http://bazaar.launchpad.net/~ubuntu-art-pkg/ubuntu-themes/trunk/revision/509#Ambiance/gtk-3.20/apps/libreoffice.css

The Arc theme issue tracker has a good discussion of the issue.

  * https://github.com/horst3180/arc-theme/issues/659

This merge proposal was adapted from:

  * https://github.com/horst3180/arc-theme/commit/5b15bdc4425b6b3b8e374f76541f020419663edd#diff-da6ed7fedc8a7bcf24b6cc6ed0573831

[Iain Lane (laney)]

I think it would be nicer to reset the values for ".libreoffice-toolbar" (and maybe ".primary-toolbar.libreoffice-toolbar) in apps/libreoffice.css if at all possible, so as not to clutter up the main theme with too many more hacks.

Please could you try that?

review: Needs Information

[Martin Wimpress (flexiondotorg)]

Alternative potential solutions I've tried are simply removing the border via:

.libreoffice-toolbar {
    background-image: none;
    border: none;
}

This has the illusion of working of light coloured toolbars, as in Ambiance. But ultimately the white border is still there, just thinner, and still encroaches slightly into the window border. Using the same change in a theme with a dark toolbar the white borders remain very evident.

I've also tried the following, which makes no difference whatsoever:

.primary-toolbar.libreoffice-toolbar {
    background-image: none;
}

.primary-toolbar.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");
}
.primary-toolbar.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");
}

[lp:~flexiondotorg/ubuntu-themes/lp1624571]

518. By Martin Wimpress on 2016-10-06

Unset border and box-shadow for LibreOffice toolbars. (LP: #1624571)

[Martin Wimpress (flexiondotorg)]

As discussed in #ubuntu-desktop a much simpler solution exists for Ambiance and Radiance:

.libreoffice-toolbar {
    background-image: none;
    border: none;
    box-shadow: none;
}

This merge proposal has been updated to use the above solution, which is far less invasive.

[Iain Lane (laney)]

Ta

review: Approve

=== modified file 'Ambiance/gtk-3.20/apps/libreoffice.css'
--- Ambiance/gtk-3.20/apps/libreoffice.css	2016-08-30 09:51:51 +0000
+++ Ambiance/gtk-3.20/apps/libreoffice.css	2016-10-06 18:53:57 +0000
@@ -1,5 +1,7 @@
 .libreoffice-toolbar {
     background-image: none;
+    border: none;
+    box-shadow: none;    
 }
 .libreoffice-toolbar button:hover {
     background-image: -gtk-gradient (linear, left top, left bottom,

=== modified file 'Radiance/gtk-3.20/apps/libreoffice.css'
--- Radiance/gtk-3.20/apps/libreoffice.css	2016-08-30 09:51:51 +0000
+++ Radiance/gtk-3.20/apps/libreoffice.css	2016-10-06 18:53:57 +0000
@@ -1,5 +1,7 @@
 .libreoffice-toolbar {
     background-image: none;
+    border: none;
+    box-shadow: none;
 }
 .libreoffice-toolbar button:hover {
     background-image: -gtk-gradient (linear, left top, left bottom,