Merge branch 'master' into 'matthiasc/for-master'

# Conflicts:
#   .gitlab-ci/test-msys2.sh

.gitlab-ci/test-msys2.sh

@@ -60,14 +60,12 @@ pkg-config --modversion pango
 ccache --zero-stats
 ccache --show-stats
 export CCACHE_DISABLE=true
-# FIXME: introspection disabled for now because of
-# https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/340
 meson \
     -Dx11-backend=false \
     -Dwayland-backend=false \
     -Dwin32-backend=true \
     -Dvulkan=disabled \
-    -Dintrospection=disabled \
+    -Dintrospection=enabled \
     -Dgtk:werror=true \
     _build
 unset CCACHE_DISABLE

gtk/theme/Adwaita/_common.scss

@@ -1343,6 +1343,45 @@ searchbar > revealer > box {
   }
 }
 
+/**************
+ * GtkInfoBar *
+ **************/
+infobar {
+  > revealer > box {
+    padding: 8px;
+    border-spacing: 12px;
+  }
+
+  &.action:hover > revealer > box {
+      background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 47%), 30%),
+                        desaturate(darken(invert($selected_bg_color), 42%), 70%));
+  }
+
+  &.info,
+  &.question,
+  &.warning,
+  &.error {
+    > revealer > box {
+      border-bottom: 1px solid lighten($borders_color, 5%);
+      background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 45%), 30%),
+                        desaturate(darken(invert($selected_bg_color), 40%), 70%));
+    }
+  }
+}
+
+   //close button for info and searchbar (#3215)
+
+   infobar .close,
+   searchbar .close {
+      @include button(undecorated);
+      min-width: 16px;
+      min-height: 16px;
+      padding: 4px;
+      border-radius: 50%;
+
+      &:hover { @include button(hover); }
+   }
+
 
 /*****************
  * Title buttons *
@@ -3622,33 +3661,6 @@ video {
   background: black;
 }
 
-/**************
- * GtkInfoBar *
- **************/
-infobar {
-  > revealer > box {
-    padding: 8px;
-    border-spacing: 12px;
-  }
-
-  &.action:hover > revealer > box {
-      background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 47%), 30%),
-                        desaturate(darken(invert($selected_bg_color), 42%), 70%));
-  }
-
-  &.info,
-  &.question,
-  &.warning,
-  &.error {
-    > revealer > box {
-      border-bottom: 1px solid lighten($borders_color, 5%);
-      background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 45%), 30%), 
-                        desaturate(darken(invert($selected_bg_color), 40%), 70%));
-    }
-  }
-}
-
-
 /************
  * Tooltips *
  ************/