[gtk: 3/3] Merge branch 'wip/jimmac/HC-redesign' into 'master'

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk: 3/3] Merge branch 'wip/jimmac/HC-redesign' into 'master'
Date: Thu, 26 Mar 2020 17:25:35 +0000 (UTC)
commit 0d710b0353e60764dcb24671109ff5e1f3cd288f
Merge: 8d8990ccd7 06fe4f0205
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Mar 26 17:24:42 2020 +0000

    Merge branch 'wip/jimmac/HC-redesign' into 'master'
    
    HC: derive from Adwaita
    
    Closes #1450
    
    See merge request GNOME/gtk!1571

 gtk/theme/Adwaita/_colors.scss                     |    2 +-
 gtk/theme/Adwaita/_common.scss                     |   10 +-
 gtk/theme/HighContrast/HighContrast-inverse.scss   |    7 +-
 gtk/theme/HighContrast/HighContrast.scss           |    7 +-
 gtk/theme/HighContrast/_colors-hc.scss             |   16 +
 gtk/theme/HighContrast/_colors.scss                |   96 -
 gtk/theme/HighContrast/_common.scss                | 3518 --------------------
 gtk/theme/HighContrast/_drawing.scss               |  378 ---
 gtk/theme/HighContrast/assets.svg                  | 2249 +++++++++++++
 gtk/theme/HighContrast/assets.txt                  |   60 +
 .../assets/bullet 2-symbolic symbolic png          |  Bin 0 -> 268 bytes
 .../assets/check 2-symbolic symbolic png           |  Bin 0 -> 381 bytes
 .../assets/dash 2-symbolic symbolic png            |  Bin 0 -> 185 bytes
 ...ider-horz-scale-has-marks-above-active-dark.png |  Bin 0 -> 829 bytes
 ...er-horz-scale-has-marks-above-active-dark 2 png |  Bin 0 -> 1603 bytes
 .../slider-horz-scale-has-marks-above-active.png   |  Bin 0 -> 990 bytes
 .../slider-horz-scale-has-marks-above-active 2 png |  Bin 0 -> 2134 bytes
 ...er-horz-scale-has-marks-above-backdrop-dark.png |  Bin 0 -> 760 bytes
 ...-horz-scale-has-marks-above-backdrop-dark 2 png |  Bin 0 -> 1405 bytes
 ...e-has-marks-above-backdrop-insensitive-dark.png |  Bin 0 -> 777 bytes
 ...has-marks-above-backdrop-insensitive-dark 2 png |  Bin 0 -> 1462 bytes
 ...-scale-has-marks-above-backdrop-insensitive.png |  Bin 0 -> 780 bytes
 ...cale-has-marks-above-backdrop-insensitive 2 png |  Bin 0 -> 1518 bytes
 .../slider-horz-scale-has-marks-above-backdrop.png |  Bin 0 -> 763 bytes
 ...lider-horz-scale-has-marks-above-backdrop 2 png |  Bin 0 -> 1520 bytes
 .../slider-horz-scale-has-marks-above-dark.png     |  Bin 0 -> 1010 bytes
 .../slider-horz-scale-has-marks-above-dark 2 png   |  Bin 0 -> 2128 bytes
 ...lider-horz-scale-has-marks-above-hover-dark.png |  Bin 0 -> 912 bytes
 ...der-horz-scale-has-marks-above-hover-dark 2 png |  Bin 0 -> 1940 bytes
 .../slider-horz-scale-has-marks-above-hover.png    |  Bin 0 -> 905 bytes
 .../slider-horz-scale-has-marks-above-hover 2 png  |  Bin 0 -> 1984 bytes
 ...horz-scale-has-marks-above-insensitive-dark.png |  Bin 0 -> 767 bytes
 ...rz-scale-has-marks-above-insensitive-dark 2 png |  Bin 0 -> 1463 bytes
 ...ider-horz-scale-has-marks-above-insensitive.png |  Bin 0 -> 807 bytes
 ...er-horz-scale-has-marks-above-insensitive 2 png |  Bin 0 -> 1497 bytes
 .../assets/slider-horz-scale-has-marks-above.png   |  Bin 0 -> 915 bytes
 .../assets/slider-horz-scale-has-marks-above 2 png |  Bin 0 -> 2088 bytes
 ...ider-horz-scale-has-marks-below-active-dark.png |  Bin 0 -> 851 bytes
 ...er-horz-scale-has-marks-below-active-dark 2 png |  Bin 0 -> 1739 bytes
 .../slider-horz-scale-has-marks-below-active.png   |  Bin 0 -> 943 bytes
 .../slider-horz-scale-has-marks-below-active 2 png |  Bin 0 -> 2167 bytes
 ...er-horz-scale-has-marks-below-backdrop-dark.png |  Bin 0 -> 783 bytes
 ...-horz-scale-has-marks-below-backdrop-dark 2 png |  Bin 0 -> 1503 bytes
 ...e-has-marks-below-backdrop-insensitive-dark.png |  Bin 0 -> 800 bytes
 ...has-marks-below-backdrop-insensitive-dark 2 png |  Bin 0 -> 1549 bytes
 ...-scale-has-marks-below-backdrop-insensitive.png |  Bin 0 -> 790 bytes
 ...cale-has-marks-below-backdrop-insensitive 2 png |  Bin 0 -> 1533 bytes
 .../slider-horz-scale-has-marks-below-backdrop.png |  Bin 0 -> 777 bytes
 ...lider-horz-scale-has-marks-below-backdrop 2 png |  Bin 0 -> 1511 bytes
 .../slider-horz-scale-has-marks-below-dark.png     |  Bin 0 -> 971 bytes
 .../slider-horz-scale-has-marks-below-dark 2 png   |  Bin 0 -> 2190 bytes
 ...lider-horz-scale-has-marks-below-hover-dark.png |  Bin 0 -> 955 bytes
 ...der-horz-scale-has-marks-below-hover-dark 2 png |  Bin 0 -> 2092 bytes
 .../slider-horz-scale-has-marks-below-hover.png    |  Bin 0 -> 896 bytes
 .../slider-horz-scale-has-marks-below-hover 2 png  |  Bin 0 -> 2083 bytes
 ...horz-scale-has-marks-below-insensitive-dark.png |  Bin 0 -> 756 bytes
 ...rz-scale-has-marks-below-insensitive-dark 2 png |  Bin 0 -> 1502 bytes
 ...ider-horz-scale-has-marks-below-insensitive.png |  Bin 0 -> 802 bytes
 ...er-horz-scale-has-marks-below-insensitive 2 png |  Bin 0 -> 1548 bytes
 .../assets/slider-horz-scale-has-marks-below.png   |  Bin 0 -> 983 bytes
 .../assets/slider-horz-scale-has-marks-below 2 png |  Bin 0 -> 2179 bytes
 ...ider-vert-scale-has-marks-above-active-dark.png |  Bin 0 -> 878 bytes
 ...er-vert-scale-has-marks-above-active-dark 2 png |  Bin 0 -> 1744 bytes
 .../slider-vert-scale-has-marks-above-active.png   |  Bin 0 -> 982 bytes
 .../slider-vert-scale-has-marks-above-active 2 png |  Bin 0 -> 2224 bytes
 ...er-vert-scale-has-marks-above-backdrop-dark.png |  Bin 0 -> 752 bytes
 ...-vert-scale-has-marks-above-backdrop-dark 2 png |  Bin 0 -> 1479 bytes
 ...e-has-marks-above-backdrop-insensitive-dark.png |  Bin 0 -> 760 bytes
 ...has-marks-above-backdrop-insensitive-dark 2 png |  Bin 0 -> 1548 bytes
 ...-scale-has-marks-above-backdrop-insensitive.png |  Bin 0 -> 791 bytes
 ...cale-has-marks-above-backdrop-insensitive 2 png |  Bin 0 -> 1563 bytes
 .../slider-vert-scale-has-marks-above-backdrop.png |  Bin 0 -> 769 bytes
 ...lider-vert-scale-has-marks-above-backdrop 2 png |  Bin 0 -> 1541 bytes
 .../slider-vert-scale-has-marks-above-dark.png     |  Bin 0 -> 1011 bytes
 .../slider-vert-scale-has-marks-above-dark 2 png   |  Bin 0 -> 2193 bytes
 ...lider-vert-scale-has-marks-above-hover-dark.png |  Bin 0 -> 969 bytes
 ...der-vert-scale-has-marks-above-hover-dark 2 png |  Bin 0 -> 2057 bytes
 .../slider-vert-scale-has-marks-above-hover.png    |  Bin 0 -> 962 bytes
 .../slider-vert-scale-has-marks-above-hover 2 png  |  Bin 0 -> 2094 bytes
 ...vert-scale-has-marks-above-insensitive-dark.png |  Bin 0 -> 724 bytes
 ...rt-scale-has-marks-above-insensitive-dark 2 png |  Bin 0 -> 1516 bytes
 ...ider-vert-scale-has-marks-above-insensitive.png |  Bin 0 -> 799 bytes
 ...er-vert-scale-has-marks-above-insensitive 2 png |  Bin 0 -> 1559 bytes
 .../assets/slider-vert-scale-has-marks-above.png   |  Bin 0 -> 1040 bytes
 .../assets/slider-vert-scale-has-marks-above 2 png |  Bin 0 -> 2201 bytes
 ...ider-vert-scale-has-marks-below-active-dark.png |  Bin 0 -> 885 bytes
 ...er-vert-scale-has-marks-below-active-dark 2 png |  Bin 0 -> 1772 bytes
 .../slider-vert-scale-has-marks-below-active.png   |  Bin 0 -> 1034 bytes
 .../slider-vert-scale-has-marks-below-active 2 png |  Bin 0 -> 2190 bytes
 ...er-vert-scale-has-marks-below-backdrop-dark.png |  Bin 0 -> 785 bytes
 ...-vert-scale-has-marks-below-backdrop-dark 2 png |  Bin 0 -> 1455 bytes
 ...e-has-marks-below-backdrop-insensitive-dark.png |  Bin 0 -> 792 bytes
 ...has-marks-below-backdrop-insensitive-dark 2 png |  Bin 0 -> 1511 bytes
 ...-scale-has-marks-below-backdrop-insensitive.png |  Bin 0 -> 787 bytes
 ...cale-has-marks-below-backdrop-insensitive 2 png |  Bin 0 -> 1562 bytes
 .../slider-vert-scale-has-marks-below-backdrop.png |  Bin 0 -> 773 bytes
 ...lider-vert-scale-has-marks-below-backdrop 2 png |  Bin 0 -> 1545 bytes
 .../slider-vert-scale-has-marks-below-dark.png     |  Bin 0 -> 1037 bytes
 .../slider-vert-scale-has-marks-below-dark 2 png   |  Bin 0 -> 2182 bytes
 ...lider-vert-scale-has-marks-below-hover-dark.png |  Bin 0 -> 971 bytes
 ...der-vert-scale-has-marks-below-hover-dark 2 png |  Bin 0 -> 2060 bytes
 .../slider-vert-scale-has-marks-below-hover.png    |  Bin 0 -> 986 bytes
 .../slider-vert-scale-has-marks-below-hover 2 png  |  Bin 0 -> 2103 bytes
 ...vert-scale-has-marks-below-insensitive-dark.png |  Bin 0 -> 735 bytes
 ...rt-scale-has-marks-below-insensitive-dark 2 png |  Bin 0 -> 1489 bytes
 ...ider-vert-scale-has-marks-below-insensitive.png |  Bin 0 -> 803 bytes
 ...er-vert-scale-has-marks-below-insensitive 2 png |  Bin 0 -> 1565 bytes
 .../assets/slider-vert-scale-has-marks-below.png   |  Bin 0 -> 1042 bytes
 .../assets/slider-vert-scale-has-marks-below 2 png |  Bin 0 -> 2214 bytes
 .../assets/text-select-end-active-dark.png         |  Bin 0 -> 797 bytes
 .../assets/text-select-end-active-dark 2 png       |  Bin 0 -> 1506 bytes
 .../HighContrast/assets/text-select-end-active.png |  Bin 0 -> 941 bytes
 .../assets/text-select-end-active 2 png            |  Bin 0 -> 1861 bytes
 .../HighContrast/assets/text-select-end-dark.png   |  Bin 0 -> 933 bytes
 .../HighContrast/assets/text-select-end-dark 2 png |  Bin 0 -> 1852 bytes
 .../assets/text-select-end-hover-dark.png          |  Bin 0 -> 829 bytes
 .../assets/text-select-end-hover-dark 2 png        |  Bin 0 -> 1545 bytes
 .../HighContrast/assets/text-select-end-hover.png  |  Bin 0 -> 927 bytes
 .../assets/text-select-end-hover 2 png             |  Bin 0 -> 1873 bytes
 gtk/theme/HighContrast/assets/text-select-end.png  |  Bin 0 -> 955 bytes
 .../HighContrast/assets/text-select-end 2 png      |  Bin 0 -> 1892 bytes
 .../assets/text-select-start-active-dark.png       |  Bin 0 -> 759 bytes
 .../assets/text-select-start-active-dark 2 png     |  Bin 0 -> 1433 bytes
 .../assets/text-select-start-active.png            |  Bin 0 -> 908 bytes
 .../assets/text-select-start-active 2 png          |  Bin 0 -> 1789 bytes
 .../HighContrast/assets/text-select-start-dark.png |  Bin 0 -> 887 bytes
 .../assets/text-select-start-dark 2 png            |  Bin 0 -> 1796 bytes
 .../assets/text-select-start-hover-dark.png        |  Bin 0 -> 764 bytes
 .../assets/text-select-start-hover-dark 2 png      |  Bin 0 -> 1478 bytes
 .../assets/text-select-start-hover.png             |  Bin 0 -> 925 bytes
 .../assets/text-select-start-hover 2 png           |  Bin 0 -> 1795 bytes
 .../HighContrast/assets/text-select-start.png      |  Bin 0 -> 916 bytes
 .../HighContrast/assets/text-select-start 2 png    |  Bin 0 -> 1835 bytes
 gtk/theme/HighContrast/meson.build                 |    4 +-
 gtk/theme/HighContrast/render-assets.sh            |   34 +
 135 files changed, 2377 insertions(+), 4004 deletions(-)
---
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]