[gtk: 3/3] Merge branch 'master' into 'master'

[Daniel Boles <dboles src gnome org>]

commit 7030e08f9c7b5670b43efd9f17ebfc8228e15bf3
Merge: 2cc6a3ee5c bada3dbac6
Author: Daniel Boles <dboles src gmail com>
Date:   Mon Jul 9 17:28:49 2018 +0000

    Merge branch 'master' into 'master'
    
    HighContrast: Restore expander size
    
    Closes #1046
    
    See merge request GNOME/gtk!167

 gtk/gtktreeview.c                                | 25 ++++++++++++++++++++----
 gtk/theme/Adwaita/_common.scss                   |  3 +++
 gtk/theme/Adwaita/gtk-contained-dark.css         |  2 +-
 gtk/theme/Adwaita/gtk-contained.css              |  2 +-
 gtk/theme/HighContrast/_common.scss              |  7 +++++--
 gtk/theme/HighContrast/gtk-contained-inverse.css |  4 ++--
 gtk/theme/HighContrast/gtk-contained.css         |  4 ++--
 7 files changed, 35 insertions(+), 12 deletions(-)
---