Merge remote-tracking branch 'origin/develop'

WestpacGEL · Oct 19, 2023 · 615905f · 615905f
2 parents 0042f89 + be6c676
commit 615905f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/ui/src/components/alert/alert.spec.tsx b/packages/ui/src/components/alert/alert.spec.tsx
@@ -1,4 +1,4 @@
-import { act, render, screen, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
+import { act, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { vi } from 'vitest';
 
@@ -18,7 +18,7 @@ describe('Alert', () => {
   it('generates the base style correctly', () => {
     const style = styles({ look: 'info', mode: 'box' });
     expect(style.base()).toBe(
-      'typography-body-10 relative mb-4 xsl:flex text-info border-y p-3 border-info-50 bg-info-5',
+      'typography-body-10 xsl:flex relative mb-4 text-info border-y p-3 border-info-50 bg-info-5',
     );
   });
 

diff --git a/packages/ui/src/components/alert/alert.styles.ts b/packages/ui/src/components/alert/alert.styles.ts
@@ -3,9 +3,9 @@ import { tv } from 'tailwind-variants';
 export const styles = tv(
   {
     slots: {
-      base: 'typography-body-10 relative mb-4 xsl:flex',
-      icon: 'float-left mr-1 flex-none xsl:mr-2',
-      body: 'relative flex-1 xsl:top-[0.125rem] [&_a]:underline',
+      base: 'typography-body-10 xsl:flex relative mb-4',
+      icon: 'xsl:mr-2 float-left mr-1 flex-none',
+      body: 'xsl:top-[0.125rem] relative flex-1 overflow-hidden [&_a]:underline',
       heading: 'typography-body-9 mb-2 font-bold',
       close: 'absolute right-[0.1875rem] top-[0.1875rem] p-1 hover:opacity-[0.8]',
     },