diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am index bcadea74a9..584d47e41e 100644 --- a/testsuite/reftests/Makefile.am +++ b/testsuite/reftests/Makefile.am @@ -213,12 +213,6 @@ testdata = \ css-match-name.css \ css-match-name.ref.ui \ css-match-name.ui \ - css-match-region-matches-star.css \ - css-match-region-matches-star.ui \ - css-match-region-matches-star.ref.ui \ - css-match-regions.css \ - css-match-regions.ref.ui \ - css-match-regions.ui \ css-match-siblings.css \ css-match-siblings.ref.ui \ css-match-siblings.ui \ diff --git a/testsuite/reftests/css-match-import-import.css b/testsuite/reftests/css-match-import-import.css index a6239ee3ab..e6e6c9a266 100644 --- a/testsuite/reftests/css-match-import-import.css +++ b/testsuite/reftests/css-match-import-import.css @@ -1,4 +1,4 @@ -GtkLabel { +label { color: blue; } diff --git a/testsuite/reftests/css-match-import.css b/testsuite/reftests/css-match-import.css index a02915b69b..6dbdf4b8a8 100644 --- a/testsuite/reftests/css-match-import.css +++ b/testsuite/reftests/css-match-import.css @@ -1,6 +1,6 @@ @import url("css-match-import-import.css"); -GtkLabel { +label { color: purple; } diff --git a/testsuite/reftests/css-match-inherit-different-state.css b/testsuite/reftests/css-match-inherit-different-state.css index d164300dcc..8cf1f0c0b0 100644 --- a/testsuite/reftests/css-match-inherit-different-state.css +++ b/testsuite/reftests/css-match-inherit-different-state.css @@ -7,6 +7,6 @@ color: red; } -GtkLabel:insensitive { +label:insensitive { color: inherit; } diff --git a/testsuite/reftests/css-match-region-matches-star.css b/testsuite/reftests/css-match-region-matches-star.css deleted file mode 100644 index 96203ac502..0000000000 --- a/testsuite/reftests/css-match-region-matches-star.css +++ /dev/null @@ -1,10 +0,0 @@ -@import "reset-to-defaults.css"; - -GtkNotebook * GtkLabel { - color: blue -} - -/* for reference */ -#blue { - color: blue -} diff --git a/testsuite/reftests/css-match-region-matches-star.ref.ui b/testsuite/reftests/css-match-region-matches-star.ref.ui deleted file mode 100644 index 3ee31fb73c..0000000000 --- a/testsuite/reftests/css-match-region-matches-star.ref.ui +++ /dev/null @@ -1,32 +0,0 @@ - - - - - False - popup - - - True - True - - - True - False - Page 1 - - - - - True - False - Page 1 - blue - - - False - - - - - - diff --git a/testsuite/reftests/css-match-region-matches-star.ui b/testsuite/reftests/css-match-region-matches-star.ui deleted file mode 100644 index adddba4d40..0000000000 --- a/testsuite/reftests/css-match-region-matches-star.ui +++ /dev/null @@ -1,31 +0,0 @@ - - - - - False - popup - - - True - True - - - True - False - Page 1 - - - - - True - False - Page 1 - - - False - - - - - - diff --git a/testsuite/reftests/css-match-regions.css b/testsuite/reftests/css-match-regions.css deleted file mode 100644 index ecd127d4bf..0000000000 --- a/testsuite/reftests/css-match-regions.css +++ /dev/null @@ -1,18 +0,0 @@ -@import "reset-to-defaults.css"; - -* { - -GtkNotebook-tab-overlap: 0; /* work around a notebook tab rendering bug */ - color: blue; -} - -.notebook tab GtkLabel { - color: blue -} -.notebook tab tab GtkLabel { - color: red -} - -/* for reference */ -#red { - color: red -} diff --git a/testsuite/reftests/css-match-regions.ref.ui b/testsuite/reftests/css-match-regions.ref.ui deleted file mode 100644 index c1e21a650d..0000000000 --- a/testsuite/reftests/css-match-regions.ref.ui +++ /dev/null @@ -1,71 +0,0 @@ - - - - - False - popup - - - True - True - - - True - False - Normal - - - - - True - False - Red - red - - - False - - - - - True - False - Normal - - - 1 - - - - - True - True - - - True - False - Red - red - - - - - True - False - Red - red - - - False - - - - - 1 - False - - - - - - diff --git a/testsuite/reftests/css-match-regions.ui b/testsuite/reftests/css-match-regions.ui deleted file mode 100644 index 15452bf0a1..0000000000 --- a/testsuite/reftests/css-match-regions.ui +++ /dev/null @@ -1,68 +0,0 @@ - - - - - False - popup - - - True - True - - - True - False - Normal - - - - - True - False - Red - - - False - - - - - True - False - Normal - - - 1 - - - - - True - True - - - True - False - Red - - - - - True - False - Red - - - False - - - - - 1 - False - - - - - - diff --git a/testsuite/reftests/css-match-siblings.css b/testsuite/reftests/css-match-siblings.css index baf2e7dab3..4c99c614bc 100644 --- a/testsuite/reftests/css-match-siblings.css +++ b/testsuite/reftests/css-match-siblings.css @@ -3,17 +3,17 @@ color: red } -* ~ * ~ GtkLabel, +* ~ * ~ label, #lime { color: lime; } -* ~ * + GtkLabel ~ *, +* ~ * + label ~ *, #blue { color: blue; } -* + GtkLabel ~ * ~ GtkLabel + *, +* + label ~ * ~ label + *, #purple { color: purple; } diff --git a/testsuite/reftests/entry-progress-coloring.css b/testsuite/reftests/entry-progress-coloring.css index 607254d908..81b312e2cb 100644 --- a/testsuite/reftests/entry-progress-coloring.css +++ b/testsuite/reftests/entry-progress-coloring.css @@ -4,11 +4,11 @@ font: Monospace; } -GtkEntry #padded { +entry #padded { padding: 10px; } -.progressbar { +progress { background-color: rgba(0,0,0,0); background-image: none; border-color: rgba(0,0,0,0); diff --git a/testsuite/reftests/icon-vfuncs.css b/testsuite/reftests/icon-vfuncs.css index aab3db4afb..00ce4ed01b 100644 --- a/testsuite/reftests/icon-vfuncs.css +++ b/testsuite/reftests/icon-vfuncs.css @@ -11,6 +11,6 @@ font-size: 20px; } -GtkImage { +image { background: lime; } diff --git a/testsuite/reftests/iconview-empty.css b/testsuite/reftests/iconview-empty.css index 519b8ebd1b..98b2d5e8ad 100644 --- a/testsuite/reftests/iconview-empty.css +++ b/testsuite/reftests/iconview-empty.css @@ -1,5 +1,5 @@ @import "reset-to-defaults.css"; -GtkIconView, GtkImage { +GtkIconView, image { background-color: blue; } diff --git a/testsuite/reftests/label-background.css b/testsuite/reftests/label-background.css index 82bb5fbbd0..37d4d08f53 100644 --- a/testsuite/reftests/label-background.css +++ b/testsuite/reftests/label-background.css @@ -6,6 +6,6 @@ GtkBox { background: red; /* should also never be seen */ } -GtkLabel { +label { background: green; } diff --git a/testsuite/reftests/label-clipping.css b/testsuite/reftests/label-clipping.css index b2e2497b55..2c4fc9160f 100644 --- a/testsuite/reftests/label-clipping.css +++ b/testsuite/reftests/label-clipping.css @@ -1,6 +1,6 @@ @import "reset-to-defaults.css"; -GtkLabel { +label { font-size: 40px; font-style: italic; } diff --git a/testsuite/reftests/label-shadows.css b/testsuite/reftests/label-shadows.css index 5df0f4c249..06f92adc2c 100644 --- a/testsuite/reftests/label-shadows.css +++ b/testsuite/reftests/label-shadows.css @@ -1,4 +1,4 @@ -GtkLabel { +label { engine: none; text-shadow: 1px 1px red; } diff --git a/testsuite/reftests/label-sizing.css b/testsuite/reftests/label-sizing.css index 0d356b6819..ca06c8fd59 100644 --- a/testsuite/reftests/label-sizing.css +++ b/testsuite/reftests/label-sizing.css @@ -3,6 +3,6 @@ padding: 0; } -GtkPaned GtkLabel { +GtkPaned label { background-color: pink } diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.css b/testsuite/reftests/label-text-shadow-changes-modify-clip.css index bea2d0c6e8..0a539076e8 100644 --- a/testsuite/reftests/label-text-shadow-changes-modify-clip.css +++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.css @@ -5,7 +5,7 @@ 100% { text-shadow: 20px 20px tomato; } } -GtkLabel { +label { font-size: 40px; animation-name: foo; animation-duration: 100s; diff --git a/testsuite/reftests/label-text-shadow-clipping.css b/testsuite/reftests/label-text-shadow-clipping.css index 9b13b51fbd..a518aa04eb 100644 --- a/testsuite/reftests/label-text-shadow-clipping.css +++ b/testsuite/reftests/label-text-shadow-clipping.css @@ -1,6 +1,6 @@ @import "reset-to-defaults.css"; -GtkLabel { +label { font-size: 40px; text-shadow: 20px 20px tomato; } diff --git a/testsuite/reftests/opacity-initial.css b/testsuite/reftests/opacity-initial.css index 611a8cd421..ff6903c182 100644 --- a/testsuite/reftests/opacity-initial.css +++ b/testsuite/reftests/opacity-initial.css @@ -1,3 +1,3 @@ -GtkLabel { +label { opacity: 0; } diff --git a/testsuite/reftests/shorthand-entry-border.css b/testsuite/reftests/shorthand-entry-border.css index 0d1d4631d8..93bad6ee8a 100644 --- a/testsuite/reftests/shorthand-entry-border.css +++ b/testsuite/reftests/shorthand-entry-border.css @@ -7,11 +7,11 @@ GtkWidget { border-right-width: 5px; } -GtkEntry { +entry { border-width: 10px 20px; } -.entry { +entry { border-left-width: 10px; border-right-width: 10px; } diff --git a/testsuite/reftests/sizegroups-basics.css b/testsuite/reftests/sizegroups-basics.css index 6ae37b9fc9..4eda6b90ea 100644 --- a/testsuite/reftests/sizegroups-basics.css +++ b/testsuite/reftests/sizegroups-basics.css @@ -1,4 +1,4 @@ -GtkLabel { +label { background-image: none; background-color: purple; color: white; diff --git a/testsuite/reftests/style-context-save-inheritance.css b/testsuite/reftests/style-context-save-inheritance.css index 3f3630c06e..5c7957af21 100644 --- a/testsuite/reftests/style-context-save-inheritance.css +++ b/testsuite/reftests/style-context-save-inheritance.css @@ -4,12 +4,12 @@ color: red; } -GtkLabel { +label { color: green; } -GtkLabel:link, -GtkLabel:visited { +label:link, +label:visited { color: inherit; } diff --git a/testsuite/reftests/treeview-fixed-height.css b/testsuite/reftests/treeview-fixed-height.css index e203cc6d5a..09160c1d2c 100644 --- a/testsuite/reftests/treeview-fixed-height.css +++ b/testsuite/reftests/treeview-fixed-height.css @@ -20,7 +20,7 @@ background-color: white; } -GtkImage, GtkLabel, .menuitem { +image, label, .menuitem { background-color: transparent; }