Merge branch '60778-input-text-height' into 'master'

Fix height of input groups

Closes #61304, #61303, #59254, and #60778

See merge request gitlab-org/gitlab-ce!28495

app/assets/stylesheets/framework/forms.scss

@@ -280,3 +280,7 @@ label {
   max-width: $input-lg-width;
   width: 100%;
 }
+
+.input-group-text {
+  max-height: $input-height;
+}

app/assets/stylesheets/framework/variables_overrides.scss

@@ -7,6 +7,7 @@ $secondary: $gray-light;
 $input-disabled-bg: $gray-light;
 $input-border-color: $gray-200;
 $input-color: $gl-text-color;
+$input-font-size: $gl-font-size;
 $font-family-sans-serif: $regular-font;
 $font-family-monospace: $monospace-font;
 $btn-line-height: 20px;

changelogs/unreleased/60778-input-text-height.yml

+---
+title: Fix input group height
+merge_request:
+author:
+type: other