[geary: 2/2] Merge branch 'wip/714129-composer-user-css' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 3ed6a82e61c22ec2a4ff3a2e3677f88fc16ce7f3
Merge: 092a5a3c a6c1962e
Author: Michael Gratton <mike vee net>
Date:   Thu Feb 28 08:15:18 2019 +0000

    Merge branch 'wip/714129-composer-user-css' into 'master'
    
    Apply custom user CSS to composer web view as well as to conversations
    
    See merge request GNOME/geary!151

 src/client/application/geary-controller.vala       |  6 +--
 src/client/components/client-web-view.vala         | 61 ++++++++++++++--------
 src/client/composer/composer-web-view.vala         |  2 +-
 .../conversation-viewer/conversation-web-view.vala | 10 +---
 .../components/client-web-view-test-case.vala      |  4 +-
 test/client/components/client-web-view-test.vala   |  6 +--
 test/js/client-page-state-test.vala                |  4 +-
 test/js/conversation-page-state-test.vala          |  4 +-
 8 files changed, 54 insertions(+), 43 deletions(-)
---