[gnome-control-center/wip/jsparber/background: 51/58] Merge branch 'background-center' into background

[Julian Sparber <jsparber src gnome org>]

commit 8f5c71c8b62e13ca0e643eb1a8a41a3c29f32fae
Merge: 4e5cb46 0b15e92
Author: Julian Sparber <julian sparber net>
Date:   Thu Nov 23 16:52:26 2017 +0100

    Merge branch 'background-center' into background

 panels/background/Makefile.am               |    4 -
 panels/background/background.ui             |  324 +++++++++++++++------------
 panels/background/cc-background-grid-item.c |  143 +++++++++++-
 panels/background/cc-background-grid-item.h |    3 +-
 panels/background/cc-background-panel.c     |  100 +--------
 panels/background/data/background.css       |    2 +-
 panels/background/test-chooser-dialog.c     |   38 ---
 7 files changed, 314 insertions(+), 300 deletions(-)
---