[gtk: 10/10] Merge branch 'matthiasc/for-master' into 'master'



commit 16654eeef4fafcccfef6c4fe2ddcee5cf2c55427
Merge: 8e41fa2778 871959c88c
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jan 24 16:20:42 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    See merge request GNOME/gtk!1348

 gtk/gtkcolorbutton.c                     |   1 +
 gtk/gtkcssprovider.c                     |  40 ++
 gtk/gtkcssselector.c                     |  44 +-
 gtk/theme/Adwaita/_common.scss           | 741 ++++++---------------------
 gtk/theme/Adwaita/gtk-contained-dark.css | 839 +++++++++++++-----------------
 gtk/theme/Adwaita/gtk-contained.css      | 845 +++++++++++++------------------
 testsuite/css/meson.build                |   4 +-
 testsuite/gtk/meson.build                |   4 +-
 8 files changed, 912 insertions(+), 1606 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]