reftests: Fix up for easy CSS changes

This is mostly search and replace ala
  GtkButton => button
  GtkWindow => window
  .button => button
or removing style properties that aren't used anymore like
  -GtkButton-default-border: 0

34 files changed, 53 insertions, 161 deletions

diff --git a/testsuite/reftests/background-area.css b/testsuite/reftests/background-area.css
index 93870ea8ed..36a3fa3552 100644
--- a/testsuite/reftests/background-area.css
+++ b/testsuite/reftests/background-area.css
@@ -1,21 +1,15 @@
 @import "reset-to-defaults.css";
 
-GtkWindow {
+window {
   background-color: rgb(0,255,0);
 }
 
-GtkButton {
+button {
   border-width: 5px;
   border-style: solid;
   border-color: rgba(255,0,0,0.6);
   padding: 10px;
   background-color: rgb(0,0,255);
-
-  /* Make sure children of button are only offset by padding */
-  -GtkButton-default-border: 0;
-  -GtkButton-inner-border: 0;
-  -GtkWidget-focus-line-width: 0;
-  -GtkWidget-focus-padding: 0;
 }
 
 #button1 {
diff --git a/testsuite/reftests/background-color-transparent.css b/testsuite/reftests/background-color-transparent.css
index 031f6b97ca..0d5f5ee2a6 100644
--- a/testsuite/reftests/background-color-transparent.css
+++ b/testsuite/reftests/background-color-transparent.css
@@ -4,7 +4,7 @@
   background-color: purple;
 }
 
-GtkButton {
+button {
   background-color: blue;
 }
 .transparent {
diff --git a/testsuite/reftests/background-origin.css b/testsuite/reftests/background-origin.css
index aa8c4a9f19..53ad92b586 100644
--- a/testsuite/reftests/background-origin.css
+++ b/testsuite/reftests/background-origin.css
@@ -1,10 +1,10 @@
 @import "reset-to-defaults.css";
 
-GtkWindow {
+window {
   background-color: rgb(255,255,255);
 }
 
-GtkButton {
+button {
   border-width: 5px;
   border-style: solid;
   border-color: rgba(255,0,0,0.5);
@@ -52,7 +52,7 @@ GtkButton {
   background-clip: content-box;
 }
 
-GtkButton#reference {
+button#reference {
   border-width: 0;
   background-image: url("reference-background-origin.png");
 }
diff --git a/testsuite/reftests/background-position.css b/testsuite/reftests/background-position.css
index aff4d1544e..ff2df307fa 100644
--- a/testsuite/reftests/background-position.css
+++ b/testsuite/reftests/background-position.css
@@ -1,17 +1,17 @@
 @import "reset-to-defaults.css";
 
-.button {
+button {
   background-image: url("green-20x20.png");
   background-repeat: no-repeat;
   background-color: red;
 }
 
-.button#ref {
+button#ref {
   background-image: none;
   background-color: lime;
 }
 
-GtkWindow#ref {
+window#ref {
   background-color: red;
 }
 
diff --git a/testsuite/reftests/background-size.css b/testsuite/reftests/background-size.css
index aae6f9f350..5a6d70e24e 100644
--- a/testsuite/reftests/background-size.css
+++ b/testsuite/reftests/background-size.css
@@ -1,6 +1,6 @@
 @import "reset-to-defaults.css";
 
-.button {
+button {
   background-image: url("border-image-balls.png");
   color: black;
   text-shadow: 1px 1px white;
diff --git a/testsuite/reftests/background-window-transparent.css b/testsuite/reftests/background-window-transparent.css
index af5e534579..ecfec47906 100644
--- a/testsuite/reftests/background-window-transparent.css
+++ b/testsuite/reftests/background-window-transparent.css
@@ -1,5 +1,5 @@
 @import "reset-to-defaults.css";
 
-GtkWindow { background-color: lime; }
+window { background-color: lime; }
 
 #reference * { background-color: lime; }
diff --git a/testsuite/reftests/border-color-default.css b/testsuite/reftests/border-color-default.css
index 4efe0e0963..6c64119b3c 100644
--- a/testsuite/reftests/border-color-default.css
+++ b/testsuite/reftests/border-color-default.css
@@ -4,7 +4,7 @@
   border-width: 5px;
 }
 
-GtkButton {
+button {
   /* using a nonexistant color because that will lead to the default value */
   border-color: @doesnotexist;
   color: purple;
diff --git a/testsuite/reftests/border-corner-zero-width-rendering.css b/testsuite/reftests/border-corner-zero-width-rendering.css
index e2cdaecc88..30cdcda102 100644
--- a/testsuite/reftests/border-corner-zero-width-rendering.css
+++ b/testsuite/reftests/border-corner-zero-width-rendering.css
@@ -7,7 +7,7 @@
   color: purple;
 }
 
-.button {
+button {
   border-radius: 10px;
   padding: 5px;
 }
diff --git a/testsuite/reftests/border-half-pixel.css b/testsuite/reftests/border-half-pixel.css
index bdfc5fe98d..6ddf655656 100644
--- a/testsuite/reftests/border-half-pixel.css
+++ b/testsuite/reftests/border-half-pixel.css
@@ -1,6 +1,6 @@
 @import "reset-to-defaults.css";
 
-.button {
+button {
   border-top: 0.5px solid red;
   border-bottom: 0.5px solid blue;
 }
diff --git a/testsuite/reftests/border-image-excess-size.css b/testsuite/reftests/border-image-excess-size.css
index d6644f28cf..5b22f955cf 100644
--- a/testsuite/reftests/border-image-excess-size.css
+++ b/testsuite/reftests/border-image-excess-size.css
@@ -1,5 +1,6 @@
+@import "reset-to-defaults.css";
+
 * {
-  engine: none;
   border-image: url("green-20x20.png") 5000;
   background-image: none;
   background-color: #000;
@@ -9,7 +10,7 @@
   border-radius: 0;
 }
 
-GtkGrid * {
+grid * {
   background-color: lime;
   border-style: none;
   border-width: 0;
diff --git a/testsuite/reftests/border-image-gradient.css b/testsuite/reftests/border-image-gradient.css
index 38e665704d..be92981f82 100644
--- a/testsuite/reftests/border-image-gradient.css
+++ b/testsuite/reftests/border-image-gradient.css
@@ -1,5 +1,4 @@
 * {
-  engine: none;
   border-image: none;
   border-radius: 0;
   border-style: solid;
diff --git a/testsuite/reftests/border-radius-clamp.css b/testsuite/reftests/border-radius-clamp.css
index d8ec308fa3..c908eea856 100644
--- a/testsuite/reftests/border-radius-clamp.css
+++ b/testsuite/reftests/border-radius-clamp.css
@@ -1,5 +1,4 @@
 .progressbar {
-  engine: none;
   border-image: none;
   border-radius: 25px;
 }
diff --git a/testsuite/reftests/border-style-none.css b/testsuite/reftests/border-style-none.css
index 25e2e98969..f5fe68d3e0 100644
--- a/testsuite/reftests/border-style-none.css
+++ b/testsuite/reftests/border-style-none.css
@@ -3,7 +3,7 @@
   border-color: red;
 }
 
-GtkButton {
+button {
   background-color: purple;
   border-style: none;
   border-width: 5px;
diff --git a/testsuite/reftests/border-style.css b/testsuite/reftests/border-style.css
index d295cb6fbd..d5471845a6 100644
--- a/testsuite/reftests/border-style.css
+++ b/testsuite/reftests/border-style.css
@@ -1,6 +1,6 @@
 @import url("reset-to-defaults.css");
 
-GtkButton {
+button {
   background-color: red;
   border-color: lime;
   border-width: 1px;
diff --git a/testsuite/reftests/box-pseudo-classes.css b/testsuite/reftests/box-pseudo-classes.css
index a89abed3ea..5aed8d07cc 100644
--- a/testsuite/reftests/box-pseudo-classes.css
+++ b/testsuite/reftests/box-pseudo-classes.css
@@ -1,29 +1,28 @@
 * {
-  engine: none;
   background-image: none;
 }
 
-.button:nth-child(even) {
+button:nth-child(even) {
   background-color: yellow;
 }
 
-.button:nth-child(odd) {
+button:nth-child(odd) {
   background-color: red;
 }
 
-.button:nth-child(first) {
+button:nth-child(first) {
   background-color: purple;
 }
 
-.button:nth-child(last):nth-child(even) {
+button:nth-child(last):nth-child(even) {
   background-color: lime;
 }
 
-.button:nth-child(last):nth-child(odd) {
+button:nth-child(last):nth-child(odd) {
   background-color: purple;
 }
 
-.button:nth-child(last):nth-child(first) {
+button:nth-child(last):nth-child(first) {
   background-color: blue;
 }
 
diff --git a/testsuite/reftests/color-transition.css b/testsuite/reftests/color-transition.css
index ac964b00b6..4daf81fd1f 100644
--- a/testsuite/reftests/color-transition.css
+++ b/testsuite/reftests/color-transition.css
@@ -4,7 +4,7 @@
   100% { background-color: blue; }
 }
 
-GtkWindow {
+window {
   background-color: #7F0080;
 }
 
diff --git a/testsuite/reftests/css-currentcolor-alpha.css b/testsuite/reftests/css-currentcolor-alpha.css
index 5af202e55b..363dccc5a2 100644
--- a/testsuite/reftests/css-currentcolor-alpha.css
+++ b/testsuite/reftests/css-currentcolor-alpha.css
@@ -1,6 +1,6 @@
 @import "reset-to-defaults.css";
 
-GtkWindow {
+window {
   color: alpha(currentColor, 0.0);
 }
 
diff --git a/testsuite/reftests/css-match-class.css b/testsuite/reftests/css-match-class.css
index 068b9cffe6..de9f069bff 100644
--- a/testsuite/reftests/css-match-class.css
+++ b/testsuite/reftests/css-match-class.css
@@ -1,7 +1,6 @@
 @import url("reset-to-defaults.css");
 
 .window {
-  engine: none;
   background-image: none;
   background-color: lime;
   border-radius: 0;
diff --git a/testsuite/reftests/css-match-descendant-later.css b/testsuite/reftests/css-match-descendant-later.css
index 421b6d40ae..2c29036ab3 100644
--- a/testsuite/reftests/css-match-descendant-later.css
+++ b/testsuite/reftests/css-match-descendant-later.css
@@ -6,6 +6,6 @@ GtkGrid GtkEventBox {
   background-color: red
 }
 
-GtkWindow > GtkGrid GtkEventBox {
+window > GtkGrid GtkEventBox {
   background-color: blue
 }
diff --git a/testsuite/reftests/css-match-inherit-different-state.css b/testsuite/reftests/css-match-inherit-different-state.css
index 8cf1f0c0b0..b557e4fd1b 100644
--- a/testsuite/reftests/css-match-inherit-different-state.css
+++ b/testsuite/reftests/css-match-inherit-different-state.css
@@ -3,10 +3,10 @@
   color: lime;
 }
 
-:insensitive {
+:disabled {
   color: red;
 }
 
-label:insensitive {
+label:disabled {
   color: inherit;
 }
diff --git a/testsuite/reftests/css-match-inherit.css b/testsuite/reftests/css-match-inherit.css
index f6d6a079a1..b00d52761a 100644
--- a/testsuite/reftests/css-match-inherit.css
+++ b/testsuite/reftests/css-match-inherit.css
@@ -1,9 +1,8 @@
 * {
-  engine: none;
   color: inherit;
 }
 
-GtkButton {
+button {
   color: red;
 }
 
diff --git a/testsuite/reftests/css-match-name.css b/testsuite/reftests/css-match-name.css
index d33f3fcfe0..339f4a7b9a 100644
--- a/testsuite/reftests/css-match-name.css
+++ b/testsuite/reftests/css-match-name.css
@@ -1,7 +1,6 @@
 @import url("reset-to-defaults.css");
 
 #window {
-  engine: none;
   background-image: none;
   background-color: lime;
   border-radius: 0;
diff --git a/testsuite/reftests/css-match-type.css b/testsuite/reftests/css-match-type.css
index 73fb465851..eb95454173 100644
--- a/testsuite/reftests/css-match-type.css
+++ b/testsuite/reftests/css-match-type.css
@@ -1,13 +1,12 @@
 @import url("reset-to-defaults.css");
 
-GtkWindow {
-  engine: none;
+window {
   background-image: none;
   background-color: lime;
   border-radius: 0;
   border-style: none;
 }
 
-NotGtkWindow {
+Notwindow {
   background-color: red;
 }
diff --git a/testsuite/reftests/css-multi-state.css b/testsuite/reftests/css-multi-state.css
index bda44b3076..cd834ff1ff 100644
--- a/testsuite/reftests/css-multi-state.css
+++ b/testsuite/reftests/css-multi-state.css
@@ -1,5 +1,5 @@
 GtkToggleButton:checked,
-#reference:insensitive {
+#reference:disabled {
   color: lime;
 }
 
diff --git a/testsuite/reftests/gtk-icontheme-sizing.css b/testsuite/reftests/gtk-icontheme-sizing.css
index 083669d512..5698467d41 100644
--- a/testsuite/reftests/gtk-icontheme-sizing.css
+++ b/testsuite/reftests/gtk-icontheme-sizing.css
@@ -1,3 +1,3 @@
-GtkBox {
+box {
   background-image: -gtk-icontheme("pan-down-symbolic");
 }
diff --git a/testsuite/reftests/icon-shadow-no-transform.css b/testsuite/reftests/icon-shadow-no-transform.css
index 66310798b8..c0e5e2dc3e 100644
--- a/testsuite/reftests/icon-shadow-no-transform.css
+++ b/testsuite/reftests/icon-shadow-no-transform.css
@@ -3,7 +3,7 @@
 * {
   -gtk-icon-source: url("green-20x20.png");
   -gtk-icon-transform: scale(0.5);
-  icon-shadow: red 1px 1px;
+  -gtk-icon-shadow: red 1px 1px;
 }
 
 #transformed {
diff --git a/testsuite/reftests/iconview-empty.css b/testsuite/reftests/iconview-empty.css
index 98b2d5e8ad..ef7aa5088e 100644
--- a/testsuite/reftests/iconview-empty.css
+++ b/testsuite/reftests/iconview-empty.css
@@ -1,5 +1,5 @@
 @import "reset-to-defaults.css";
 
-GtkIconView, image {
+iconview, image {
   background-color: blue;
 }
diff --git a/testsuite/reftests/image-icon-shadow-clipping.css b/testsuite/reftests/image-icon-shadow-clipping.css
index 4770cc1034..1b977a6d81 100644
--- a/testsuite/reftests/image-icon-shadow-clipping.css
+++ b/testsuite/reftests/image-icon-shadow-clipping.css
@@ -1,5 +1,5 @@
 @import "reset-to-defaults.css";
 
-GtkImage {
-  icon-shadow: 20px 20px tomato;
+image {
+  -gtk-icon-shadow: 20px 20px tomato;
 }
diff --git a/testsuite/reftests/label-background.css b/testsuite/reftests/label-background.css
index 37d4d08f53..8ae5176850 100644
--- a/testsuite/reftests/label-background.css
+++ b/testsuite/reftests/label-background.css
@@ -1,4 +1,4 @@
-GtkWindow {
+window {
   background: darkred; /* should never be seen */
 }
 
diff --git a/testsuite/reftests/label-shadows.css b/testsuite/reftests/label-shadows.css
index 06f92adc2c..9598c1a415 100644
--- a/testsuite/reftests/label-shadows.css
+++ b/testsuite/reftests/label-shadows.css
@@ -1,5 +1,4 @@
 label {
-  engine: none;
   text-shadow: 1px 1px red;
 }
 
diff --git a/testsuite/reftests/opacity.css b/testsuite/reftests/opacity.css
index 10b906c3d6..d95ba8d33b 100644
--- a/testsuite/reftests/opacity.css
+++ b/testsuite/reftests/opacity.css
@@ -1,6 +1,6 @@
 @import "reset-to-defaults.css";
 
-GtkButton {
+button {
   border-width: 5px;
   border-style: solid;
   border-color: rgb(255,0,0);
diff --git a/testsuite/reftests/shorthand-entry-border.css b/testsuite/reftests/shorthand-entry-border.css
index 93bad6ee8a..b8f28f68a3 100644
--- a/testsuite/reftests/shorthand-entry-border.css
+++ b/testsuite/reftests/shorthand-entry-border.css
@@ -1,5 +1,4 @@
 * {
-  engine: none;
   border-radius: 0;
 }
 
diff --git a/testsuite/reftests/treeview-fixed-height.css b/testsuite/reftests/treeview-fixed-height.css
index 09160c1d2c..4ac59da430 100644
--- a/testsuite/reftests/treeview-fixed-height.css
+++ b/testsuite/reftests/treeview-fixed-height.css
@@ -28,11 +28,11 @@ image, label, .menuitem {
     background-color: @color_tip;
 }
 
-*:insensitive {
+*:disabled {
     color: @color_dark;
 }
 
-*:selected, .menuitem:prelight, *:prelight {
+*:selected, .menuitem:hover , *:hover {
     background-color: @color_sel;
     color: white;
 }
@@ -41,7 +41,7 @@ GtkCheckButton:selected {
     background-color: @color_base;
 }
 
-.check:prelight, .check:selected, .radio:prelight, .radio:selected {
+.check:hover, .check:selected, .radio:hover, .radio:selected {
     background-color: white;
     color: black;
 }
@@ -53,22 +53,22 @@ GtkCheckButton:selected {
 
 /* GRADIENTS */
 
-.button, .notebook tab:active, .slider {
+button, .notebook tab:active, .slider {
     background-image: -gtk-gradient (linear, left top, left bottom,
      from (shade (@color_base, 1.2)), to (@color_base));
 }
 
-.button:active, .notebook tab, .trough {
+button:active, .notebook tab, .trough {
     background-image: -gtk-gradient (linear, left top, left bottom,
      from (shade (@color_base, 0.8)), to (@color_base));
 }
 
-.button.vertical, .slider.vertical {
+button.vertical, .slider.vertical {
     background-image: -gtk-gradient (linear, left top, right top,
      from (shade (@color_base, 1.2)), to (@color_base));
 }
 
-.button.vertical:active, .trough.vertical {
+button.vertical:active, .trough.vertical {
     background-image: -gtk-gradient (linear, left top, right top,
      from (shade (@color_base, 0.8)), to (@color_base));
 }
@@ -110,21 +110,21 @@ column-header > .button {
     padding: 0px 3px 0px 3px;
 }
 
-.button, .check, .entry, .frame, .notebook, .progressbar, .radio, .scale,
+button, .check, .entry, .frame, .notebook, .progressbar, .radio, .scale,
  .scrollbar, .slider, .trough {
     border-radius: 2px;
     border-width: 1px;
 }
 
-.notebook tab {
+notebook tab {
     padding: 2px;
 }
 
-.notebook tab:active {
+notebook tab:active {
     padding: 3px;
 }
 
-.button {
+button {
     padding: 3px;
 }
 
@@ -159,97 +159,3 @@ column-header > .button {
     border-width: 0px 0px 1px 0px;
 }
 
-.scrollbar {
-    border-radius: 0px;
-}
-
-.scrollbar.trough {
-    border-width: 1px 1px 0px 1px;
-}
-
-.scrollbar.trough.vertical {
-    border-width: 1px 0px 1px 1px;
-}
-
-.scrollbar.button.left, .scrollbar.button.right {
-    border-width: 1px 0px 0px 0px;
-}
-
-.scrollbar.button.top, .scrollbar.button.bottom {
-    border-width: 0px 0px 0px 1px;
-}
-
-.scrollbars-junction {
-    border-width: 1px 0px 0px 1px;
-}
-
-.scrollbar.slider {
-    border-width: 1px 1px 0px 1px;
-}
-
-.scrollbar.slider.vertical {
-    border-width: 1px 0px 1px 1px;
-}
-
-.separator {
-    border-width: 1px;
-    padding: 1px;
-}
-
-GtkComboBox .separator, GtkFontButton .separator {
-    border-width: 0px;
-    padding: 0px;
-}
-
-.tooltip {
-    border-width: 1px;
-    padding: 2px;
-}
-
-/* MISC SETTINGS */
-
-* {
-    -GtkButton-default-border: 0;
-    -GtkButton-image-spacing: 4;
-    -GtkButtonBox-child-internal-pad-x: 0;
-    -GtkButtonBox-child-internal-pad-y: 0;
-    -GtkButtonBox-child-min-width: 0;
-    -GtkButtonBox-child-min-height: 0;
-    -GtkCheckButton-indicator-size: 12;
-    -GtkCheckMenuItem-indicator-size: 12;
-    -GtkComboBox-arrow-scaling: 0.667;
-    -GtkDialog-action-area-border: 0;
-    -GtkDialog-button-spacing: 6;
-    -GtkDialog-content-area-border: 6;
-    -GtkDialog-content-area-spacing: 6;
-    -GtkEntry-inner-border: 1;
-    -GtkMenu-horizontal-padding: 1;
-    -GtkMenu-horizontal-offset: 0;
-    -GtkMenuBar-internal-padding: 0;
-    -GtkMenuItem-arrow-scaling: 0.667;
-    -GtkMenuItem-toggle-spacing: 6;
-    -GtkNotebook-tab-overlap: 1;
-    -GtkPaned-handle-size: 6;
-    -GtkProgressBar-min-horizontal-bar-height: 12;
-    -GtkProgressBar-min-vertical-bar-width: 12;
-    -GtkRange-slider-width: 12;
-    -GtkRange-trough-border: 0;
-    -GtkScale-slider-length: 30;
-    -GtkScrolledWindow-scrollbar-spacing: 0;
-    -GtkScrolledWindow-scrollbars-within-bevel: 1;
-    -GtkTreeView-horizontal-separator: 0;
-    -GtkTreeView-vertical-separator: 0;
-    -GtkWidget-focus-line-width: 0;
-    -GtkWidget-focus-padding: 0;
-    -GtkWidget-separator-height: 1;
-    -GtkWidget-separator-width: 1;
-    -GtkWidget-wide-separators: TRUE;
-    -GtkWindow-resize-grip-height: 0;
-}
-
-.scrollbar {
-    -GtkRange-slider-width: 17;
-    -GtkRange-stepper-size: 16;
-    -GtkRange-trough-under-steppers: FALSE;
-    -GtkScrollbar-min-slider-length: 18;
-}
diff --git a/testsuite/reftests/unresolvable.css b/testsuite/reftests/unresolvable.css
index 31c216166f..94ef135351 100644
--- a/testsuite/reftests/unresolvable.css
+++ b/testsuite/reftests/unresolvable.css
@@ -1,6 +1,6 @@
 @import "reset-to-defaults.css";
 
-GtkWindow {
+window {
   background-color: @doesntexist;
   box-shadow: @nonexistant 5px 5px;
   border-image: -gtk-gradient(linear,