From 8bdc491ce37b9e93ff78d214fd77a454bfdb82ae Mon Sep 17 00:00:00 2001
From: James Brooks <jamesbrooks@spotify.com>
Date: Wed, 6 Aug 2025 17:16:26 +0100
Subject: [PATCH 1/2] BUI - Remove CSS import from Select component

Signed-off-by: James Brooks <jamesbrooks@spotify.com>
---
 .changeset/quick-keys-post.md                | 5 +++++
 packages/ui/src/components/Select/Select.tsx | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/quick-keys-post.md

diff --git a/.changeset/quick-keys-post.md b/.changeset/quick-keys-post.md
new file mode 100644
index 0000000000..c0e56be791
--- /dev/null
+++ b/.changeset/quick-keys-post.md
@@ -0,0 +1,5 @@
+---
+'@backstage/ui': patch
+---
+
+Remove stylesheet import from Select component.
diff --git a/packages/ui/src/components/Select/Select.tsx b/packages/ui/src/components/Select/Select.tsx
index d404b39e1a..c63e8964ab 100644
--- a/packages/ui/src/components/Select/Select.tsx
+++ b/packages/ui/src/components/Select/Select.tsx
@@ -25,7 +25,6 @@ import {
   Text,
 } from 'react-aria-components';
 import clsx from 'clsx';
-import './Select.styles.css';
 import { SelectProps } from './types';
 import { useStyles } from '../../hooks/useStyles';
 import { FieldLabel } from '../FieldLabel';

From 79844b5dd6ba098b1c40362604b976cab877ab8b Mon Sep 17 00:00:00 2001
From: James Brooks <jamesbrooks@spotify.com>
Date: Wed, 6 Aug 2025 17:41:11 +0100
Subject: [PATCH 2/2] CSS changes

Signed-off-by: James Brooks <jamesbrooks@spotify.com>
---
 packages/ui/css/styles.css | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/ui/css/styles.css b/packages/ui/css/styles.css
index 0169aa6653..b923073ee6 100644
--- a/packages/ui/css/styles.css
+++ b/packages/ui/css/styles.css
@@ -10429,7 +10429,6 @@
   font-size: var(--bui-font-size-3);
   font-family: var(--bui-font-regular);
   color: var(--bui-fg-primary);
-  --tooltip-offset: var(--bui-space-3);
   border-radius: 4px;
   outline: none;
   transition: transform .2s, opacity .2s;
@@ -10441,6 +10440,8 @@
     opacity: 0;
   }
 
+  --tooltip-offset: var(--bui-space-3);
+
   &[data-placement="top"] {
     margin-bottom: var(--tooltip-offset);
     --origin: translateY(4px);
@@ -10464,7 +10465,6 @@
 
 .bui-TooltipArrow {
   & svg {
-    --tooltip-arrow-overlap: -2px;
     display: block;
 
     & path:first-child {
@@ -10474,6 +10474,8 @@
     & path:nth-child(2) {
       fill: var(--bui-gray-3);
     }
+
+    --tooltip-arrow-overlap: -2px;
   }
 
   &[data-placement="top"] svg {