From 86b6c4f85b7b30bb4a13d57450a76bf4c28a3fff Mon Sep 17 00:00:00 2001
From: Eli Bosley <ekbosley@gmail.com>
Date: Wed, 23 Jul 2025 15:30:57 -0400
Subject: [PATCH] fix: inject Tailwind CSS into client entry point (#1537)

Added a Vite plugin to automatically inject the Tailwind CSS import into
the `unraid-components.client.js` entry file, enhancing the integration
of Tailwind CSS within the application. This change improves the setup
for styling components consistently across the project.

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **New Features**
* Added automated validation to ensure Tailwind CSS styles are correctly
included in the custom elements build output.

* **Chores**
* Updated the build process to include a CSS validation step after
manifest generation.
* Enhanced development build configuration to enable CSS source maps and
optimize Tailwind CSS injection into web components.
  * Extended CSS theme with new responsive breakpoint variables.
* Improved CSS class specificity in user profile, server state, and
update modal components for consistent styling.
* Removed redundant style blocks and global CSS imports from multiple
components to streamline styling and reduce duplication.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 .claude/settings.local.json                   |   9 +-
 .../include/web-components-extractor.php      |   1 +
 web/assets/main.css                           |   6 +
 web/components/Activation/WelcomeModal.ce.vue |  54 ------
 web/components/ApiKeyPage.ce.vue              |   5 -
 web/components/Auth.ce.vue                    |   6 -
 web/components/CallbackHandler.ce.vue         |   6 -
 web/components/ColorSwitcher.ce.vue           |   6 -
 .../ConnectSettings/ConnectSettings.ce.vue    |   5 -
 web/components/DevSettings.vue                |   6 -
 web/components/DowngradeOs.ce.vue             |   6 -
 web/components/DownloadApiLogs.ce.vue         |   6 -
 web/components/DummyServerSwitcher.vue        |   6 -
 web/components/HeaderOsVersion.ce.vue         |   7 -
 web/components/Logs/LogViewer.ce.vue          |   6 -
 web/components/Modals.ce.vue                  |  54 ------
 web/components/RClone/RCloneConfig.vue        |   5 -
 web/components/Registration.ce.vue            |   6 -
 web/components/SsoButton.ce.vue               |   6 -
 web/components/ThemeSwitcher.ce.vue           |   6 -
 web/components/UpdateOs.ce.vue                |  54 ------
 web/components/UpdateOs/ChangelogModal.vue    |   6 +-
 .../UpdateOs/CheckUpdateResponseModal.vue     |  17 +-
 web/components/UpdateOs/Downgrade.vue         |   6 -
 web/components/UpdateOs/Update.vue            |   6 -
 web/components/UpdateOs/UpdateIneligible.vue  |   6 -
 web/components/UserProfile.ce.vue             |  64 +------
 .../UserProfile/CallbackFeedback.vue          |  54 ------
 .../UserProfile/DropdownLaunchpad.vue         |  71 --------
 web/components/UserProfile/ServerState.vue    |   2 +-
 web/components/WanIpCheck.ce.vue              |   6 -
 .../Wrapper/web-component-plugins.ts          |  20 ++-
 web/nuxt.config.ts                            | 123 ++++----------
 web/package.json                              |   3 +-
 web/pages/index.vue                           |  14 --
 web/scripts/validate-custom-elements-css.js   | 158 ++++++++++++++++++
 36 files changed, 242 insertions(+), 580 deletions(-)
 create mode 100644 web/scripts/validate-custom-elements-css.js

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index eb4cb4f57..45f0a7bae 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -16,7 +16,6 @@
       "mcp__ide__getDiagnostics",
       "Bash(pnpm --filter \"*connect*\" test connect-status-writer.service.spec)",
       "Bash(pnpm storybook:*)",
-      "Bash(rm:*)",
       "Bash(pnpm add:*)",
       "Bash(pnpm install:*)",
       "Bash(pkill:*)",
@@ -33,7 +32,13 @@
       "Bash(pnpm --filter @unraid/ui build)",
       "Bash(pnpm --filter @unraid/web build)",
       "Bash(python3:*)",
-      "Bash(pnpm tailwind:build:*)"
+      "Bash(pnpm tailwind:build:*)",
+      "WebFetch(domain:erangrin.github.io)",
+      "Bash(pnpm clean:*)",
+      "Bash(pnpm validate:css:*)",
+      "Bash(node:*)",
+      "Bash(rm:*)",
+      "Bash(pnpm run:*)"
     ]
   },
   "enableAllProjectMcpServers": false
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/web-components-extractor.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/web-components-extractor.php
index d5a4ca768..bbebeff38 100644
--- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/web-components-extractor.php
+++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/web-components-extractor.php
@@ -39,6 +39,7 @@ class WebComponentsExtractor
         return $contents ? json_decode($contents, true) : [];
     }
 
+
     private function getRichComponentsFile(): string
     {
         $manifestFiles = $this->findManifestFiles('manifest.json');
diff --git a/web/assets/main.css b/web/assets/main.css
index ddf757c50..de7991be6 100644
--- a/web/assets/main.css
+++ b/web/assets/main.css
@@ -12,6 +12,12 @@
 @custom-variant dark (&:where(.dark, .dark *));
 
 @theme {
+  /* Breakpoints */
+  --breakpoint-xs: 30rem;
+  --breakpoint-2xl: 100rem;
+  --breakpoint-3xl: 120rem;
+
+  /* Colors */
   --color-primary-50: #fff7ed;
   --color-primary-100: #ffedd5;
   --color-primary-200: #fed7aa;
diff --git a/web/components/Activation/WelcomeModal.ce.vue b/web/components/Activation/WelcomeModal.ce.vue
index d13e6609d..a33a86a85 100644
--- a/web/components/Activation/WelcomeModal.ce.vue
+++ b/web/components/Activation/WelcomeModal.ce.vue
@@ -101,57 +101,3 @@ watchEffect(() => {
     </Dialog>
   </div>
 </template>
-
-<style>
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-
-.unraid_mark_2,
-.unraid_mark_4 {
-  animation: mark_2 1.5s ease infinite;
-}
-.unraid_mark_3 {
-  animation: mark_3 1.5s ease infinite;
-}
-.unraid_mark_6,
-.unraid_mark_8 {
-  animation: mark_6 1.5s ease infinite;
-}
-.unraid_mark_7 {
-  animation: mark_7 1.5s ease infinite;
-}
-
-@keyframes mark_2 {
-  50% {
-    transform: translateY(-40px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_3 {
-  50% {
-    transform: translateY(-62px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_6 {
-  50% {
-    transform: translateY(40px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_7 {
-  50% {
-    transform: translateY(62px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-</style>
diff --git a/web/components/ApiKeyPage.ce.vue b/web/components/ApiKeyPage.ce.vue
index b1e5904e7..1bd51ab23 100644
--- a/web/components/ApiKeyPage.ce.vue
+++ b/web/components/ApiKeyPage.ce.vue
@@ -6,8 +6,3 @@ import ApiKeyManager from '~/components/ApiKey/ApiKeyManager.vue';
     <ApiKeyManager />
   </div>
 </template>
-<style>
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/Auth.ce.vue b/web/components/Auth.ce.vue
index 2b6f8aa2f..5ccc4d529 100644
--- a/web/components/Auth.ce.vue
+++ b/web/components/Auth.ce.vue
@@ -30,9 +30,3 @@ const { authAction, stateData } = storeToRefs(serverStore);
     </span>
   </div>
 </template>
-
-<style>
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/CallbackHandler.ce.vue b/web/components/CallbackHandler.ce.vue
index 4225af948..fba4308a2 100644
--- a/web/components/CallbackHandler.ce.vue
+++ b/web/components/CallbackHandler.ce.vue
@@ -14,9 +14,3 @@ onBeforeMount(() => {
     <slot />
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/ColorSwitcher.ce.vue b/web/components/ColorSwitcher.ce.vue
index 32de575d0..0858a358e 100644
--- a/web/components/ColorSwitcher.ce.vue
+++ b/web/components/ColorSwitcher.ce.vue
@@ -74,9 +74,3 @@ const items = [
     <Switch id="banner" v-model:checked="form.banner" />
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/ConnectSettings/ConnectSettings.ce.vue b/web/components/ConnectSettings/ConnectSettings.ce.vue
index 06f4ca8ba..eb78b7c89 100644
--- a/web/components/ConnectSettings/ConnectSettings.ce.vue
+++ b/web/components/ConnectSettings/ConnectSettings.ce.vue
@@ -148,8 +148,3 @@ const onChange = ({ data }: { data: Record<string, unknown> }) => {
     </div>
   </div>
 </template>
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '../../assets/main.css';
-</style>
diff --git a/web/components/DevSettings.vue b/web/components/DevSettings.vue
index 4c5fc6aa1..4c67b5d1e 100644
--- a/web/components/DevSettings.vue
+++ b/web/components/DevSettings.vue
@@ -23,9 +23,3 @@ import { CogIcon } from '@heroicons/vue/24/solid';
 
   
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/DowngradeOs.ce.vue b/web/components/DowngradeOs.ce.vue
index 99e951115..f2db1ffaf 100644
--- a/web/components/DowngradeOs.ce.vue
+++ b/web/components/DowngradeOs.ce.vue
@@ -77,9 +77,3 @@ onBeforeMount(() => {
     </PageContainer>
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/DownloadApiLogs.ce.vue b/web/components/DownloadApiLogs.ce.vue
index 43196e69a..a69d3de2a 100644
--- a/web/components/DownloadApiLogs.ce.vue
+++ b/web/components/DownloadApiLogs.ce.vue
@@ -71,9 +71,3 @@ const downloadUrl = computed(() => {
     </span>
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/DummyServerSwitcher.vue b/web/components/DummyServerSwitcher.vue
index 810691022..c2a29f6f1 100644
--- a/web/components/DummyServerSwitcher.vue
+++ b/web/components/DummyServerSwitcher.vue
@@ -24,9 +24,3 @@ const items = [
     <Select v-model="selector" :items="items" placeholder="Select an initial state" />
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/HeaderOsVersion.ce.vue b/web/components/HeaderOsVersion.ce.vue
index b9e6b83d2..bb76d4a59 100644
--- a/web/components/HeaderOsVersion.ce.vue
+++ b/web/components/HeaderOsVersion.ce.vue
@@ -127,10 +127,3 @@ const updateOsStatus = computed(() => {
     </div>
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/Logs/LogViewer.ce.vue b/web/components/Logs/LogViewer.ce.vue
index f6ed9adce..2dafd4d3f 100644
--- a/web/components/Logs/LogViewer.ce.vue
+++ b/web/components/Logs/LogViewer.ce.vue
@@ -191,9 +191,3 @@ watch(selectedLogFile, (newValue) => {
     </div>
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/Modals.ce.vue b/web/components/Modals.ce.vue
index 9735e338e..2a2d0c354 100644
--- a/web/components/Modals.ce.vue
+++ b/web/components/Modals.ce.vue
@@ -31,57 +31,3 @@ const { modalVisible: apiKeyModalVisible } = storeToRefs(useApiKeyStore());
     <ApiKeyCreate :open="apiKeyModalVisible" :t="t" />
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-
-.unraid_mark_2,
-.unraid_mark_4 {
-  animation: mark_2 1.5s ease infinite;
-}
-.unraid_mark_3 {
-  animation: mark_3 1.5s ease infinite;
-}
-.unraid_mark_6,
-.unraid_mark_8 {
-  animation: mark_6 1.5s ease infinite;
-}
-.unraid_mark_7 {
-  animation: mark_7 1.5s ease infinite;
-}
-
-@keyframes mark_2 {
-  50% {
-    transform: translateY(-40px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_3 {
-  50% {
-    transform: translateY(-62px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_6 {
-  50% {
-    transform: translateY(40px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_7 {
-  50% {
-    transform: translateY(62px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-</style>
diff --git a/web/components/RClone/RCloneConfig.vue b/web/components/RClone/RCloneConfig.vue
index de30123a4..a72fe78d6 100644
--- a/web/components/RClone/RCloneConfig.vue
+++ b/web/components/RClone/RCloneConfig.vue
@@ -238,8 +238,3 @@ provide('isSubmitting', isCreating);
     </div>
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-</style>
diff --git a/web/components/Registration.ce.vue b/web/components/Registration.ce.vue
index 77407df06..81d9b3593 100644
--- a/web/components/Registration.ce.vue
+++ b/web/components/Registration.ce.vue
@@ -324,9 +324,3 @@ const items = computed((): RegistrationItemProps[] => {
     </PageContainer>
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/SsoButton.ce.vue b/web/components/SsoButton.ce.vue
index df60c7925..dabeadaf9 100644
--- a/web/components/SsoButton.ce.vue
+++ b/web/components/SsoButton.ce.vue
@@ -150,9 +150,3 @@ const navigateToExternalSSOUrl = () => {
     </template>
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/ThemeSwitcher.ce.vue b/web/components/ThemeSwitcher.ce.vue
index 6eb085d2f..06df7dc5d 100644
--- a/web/components/ThemeSwitcher.ce.vue
+++ b/web/components/ThemeSwitcher.ce.vue
@@ -91,9 +91,3 @@ const handleThemeChange = (event: Event) => {
     </select>
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/UpdateOs.ce.vue b/web/components/UpdateOs.ce.vue
index 2979ca90b..3586f63e1 100644
--- a/web/components/UpdateOs.ce.vue
+++ b/web/components/UpdateOs.ce.vue
@@ -73,57 +73,3 @@ onBeforeMount(() => {
       <UpdateOsThirdPartyDrivers v-if="rebootType === 'thirdPartyDriversDownloading'" :t="t" />
     </PageContainer>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-
-.unraid_mark_2,
-.unraid_mark_4 {
-  animation: mark_2 1.5s ease infinite;
-}
-.unraid_mark_3 {
-  animation: mark_3 1.5s ease infinite;
-}
-.unraid_mark_6,
-.unraid_mark_8 {
-  animation: mark_6 1.5s ease infinite;
-}
-.unraid_mark_7 {
-  animation: mark_7 1.5s ease infinite;
-}
-
-@keyframes mark_2 {
-  50% {
-    transform: translateY(-40px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_3 {
-  50% {
-    transform: translateY(-62px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_6 {
-  50% {
-    transform: translateY(40px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_7 {
-  50% {
-    transform: translateY(62px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-</style>
diff --git a/web/components/UpdateOs/ChangelogModal.vue b/web/components/UpdateOs/ChangelogModal.vue
index 5614adf97..fa2338b8b 100644
--- a/web/components/UpdateOs/ChangelogModal.vue
+++ b/web/components/UpdateOs/ChangelogModal.vue
@@ -9,7 +9,7 @@ import {
   KeyIcon,
   ServerStackIcon,
 } from '@heroicons/vue/24/solid';
-import { BrandButton, BrandLoading } from '@unraid/ui';
+import { BrandButton, BrandLoading, cn } from '@unraid/ui';
 import { allowedDocsOriginRegex, allowedDocsUrlRegex } from '~/helpers/urls';
 
 import type { ComposerTranslation } from 'vue-i18n';
@@ -176,8 +176,8 @@ watch(darkMode, () => {
     </template>
 
     <template #footer>
-      <div class="flex flex-col-reverse xs:flex-row justify-between gap-3 md:gap-4">
-        <div class="flex flex-col-reverse xs:flex-row xs:justify-start gap-3 md:gap-4">
+      <div :class="cn('flex flex-col-reverse xs:!flex-row justify-between gap-3 md:gap-4')">
+        <div :class="cn('flex flex-col-reverse xs:!flex-row xs:justify-start gap-3 md:gap-4')">
           <!-- Back to changelog button (when navigated away) -->
           <BrandButton
             v-if="hasNavigated && docsChangelogUrl"
diff --git a/web/components/UpdateOs/CheckUpdateResponseModal.vue b/web/components/UpdateOs/CheckUpdateResponseModal.vue
index dcb2d3558..14098efff 100644
--- a/web/components/UpdateOs/CheckUpdateResponseModal.vue
+++ b/web/components/UpdateOs/CheckUpdateResponseModal.vue
@@ -10,7 +10,7 @@ import {
   KeyIcon,
   XMarkIcon,
 } from '@heroicons/vue/24/solid';
-import { BrandButton, BrandLoading } from '@unraid/ui';
+import { BrandButton, BrandLoading, cn } from '@unraid/ui';
 import { Switch, SwitchGroup, SwitchLabel } from '@headlessui/vue';
 
 import type { BrandButtonProps } from '@unraid/ui';
@@ -276,7 +276,7 @@ const modalWidth = computed(() => {
     <template v-if="renderMainSlot" #main>
       <BrandLoading v-if="checkForUpdatesLoading" class="w-[150px] mx-auto" />
       <div v-else class="flex flex-col gap-y-4">
-        <div v-if="extraLinks.length > 0" class="flex flex-col xs:flex-row justify-center gap-2">
+        <div v-if="extraLinks.length > 0" :class="cn('flex flex-col xs:!flex-row justify-center gap-2')">
           <BrandButton
             v-for="item in extraLinks"
             :key="item.text"
@@ -335,13 +335,12 @@ const modalWidth = computed(() => {
 
     <template #footer>
       <div
-        class="w-full flex gap-2 mx-auto"
-        :class="{
-          'flex-col-reverse xs:flex-row justify-between': actionButtons,
-          'justify-center': !actionButtons,
-        }"
+        :class="cn(
+          'w-full flex gap-2 mx-auto',
+          actionButtons ? 'flex-col-reverse xs:!flex-row justify-between' : 'justify-center'
+        )"
       >
-        <div class="flex flex-col-reverse xs:flex-row justify-start gap-2">
+        <div :class="cn('flex flex-col-reverse xs:!flex-row justify-start gap-2')">
           <BrandButton
             variant="underline-hover-red"
             :icon="XMarkIcon"
@@ -355,7 +354,7 @@ const modalWidth = computed(() => {
             @click="accountStore.updateOs()"
           />
         </div>
-        <div v-if="actionButtons" class="flex flex-col xs:flex-row justify-end gap-2">
+        <div v-if="actionButtons" :class="cn('flex flex-col xs:!flex-row justify-end gap-2')">
           <BrandButton
             v-for="item in actionButtons"
             :key="item.text"
diff --git a/web/components/UpdateOs/Downgrade.vue b/web/components/UpdateOs/Downgrade.vue
index b69f86b43..6dec928ce 100644
--- a/web/components/UpdateOs/Downgrade.vue
+++ b/web/components/UpdateOs/Downgrade.vue
@@ -130,9 +130,3 @@ const downgradeButton = ref<UserProfileLink>({
     </div>
   </CardWrapper>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/UpdateOs/Update.vue b/web/components/UpdateOs/Update.vue
index b341f75c1..5332fd62e 100644
--- a/web/components/UpdateOs/Update.vue
+++ b/web/components/UpdateOs/Update.vue
@@ -262,9 +262,3 @@ watchEffect(() => {
     </div>
   </CardWrapper>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/UpdateOs/UpdateIneligible.vue b/web/components/UpdateOs/UpdateIneligible.vue
index b37695fd7..2a387ba7a 100644
--- a/web/components/UpdateOs/UpdateIneligible.vue
+++ b/web/components/UpdateOs/UpdateIneligible.vue
@@ -121,9 +121,3 @@ watchEffect(() => {
     </div>
   </CardWrapper>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/UserProfile.ce.vue b/web/components/UserProfile.ce.vue
index 308dbaff5..515aeb859 100644
--- a/web/components/UserProfile.ce.vue
+++ b/web/components/UserProfile.ce.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
 import { useClipboard } from '@vueuse/core';
 
-import { DropdownMenu } from '@unraid/ui';
+import { DropdownMenu, cn } from '@unraid/ui';
 import { devConfig } from '~/helpers/env';
 
 import type { Server } from '~/types/server';
@@ -109,10 +109,10 @@ onMounted(() => {
     />
 
     <div
-      class="text-xs text-header-text-secondary text-right font-semibold leading-normal relative z-10 flex flex-wrap items-baseline justify-end gap-x-1 xs:flex-row xs:gap-x-4"
+      :class="cn('text-xs text-header-text-secondary text-right font-semibold leading-normal relative z-10 flex flex-wrap xs:!flex-row items-baseline justify-end gap-x-1 xs:gap-x-4')"
     >
       <UpcUptimeExpire :as="'span'" :t="t" class="text-xs" />
-      <span class="hidden xs:block">&bull;</span>
+      <span class="hidden xs:!block">&bull;</span>
       <UpcServerState :t="t" class="text-xs" />
     </div>
 
@@ -121,8 +121,8 @@ onMounted(() => {
         class="text-md sm:text-lg relative flex flex-col-reverse items-end md:flex-row border-0 text-header-text-primary"
       >
         <template v-if="description && theme?.descriptionShow">
-          <span class="text-right text-xs sm:text-lg hidden 2xs:block" v-html="description" />
-          <span class="text-header-text-secondary hidden md:inline-block px-2">&bull;</span>
+          <span class="text-right text-xs sm:text-lg hidden 2xs:!block" v-html="description" />
+          <span class="text-header-text-secondary hidden md:!inline-block px-2">&bull;</span>
         </template>
         <button
           v-if="lanIp"
@@ -164,57 +164,3 @@ onMounted(() => {
     </div>
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-
-.unraid_mark_2,
-.unraid_mark_4 {
-  animation: mark_2 1.5s ease infinite;
-}
-.unraid_mark_3 {
-  animation: mark_3 1.5s ease infinite;
-}
-.unraid_mark_6,
-.unraid_mark_8 {
-  animation: mark_6 1.5s ease infinite;
-}
-.unraid_mark_7 {
-  animation: mark_7 1.5s ease infinite;
-}
-
-@keyframes mark_2 {
-  50% {
-    transform: translateY(-40px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_3 {
-  50% {
-    transform: translateY(-62px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_6 {
-  50% {
-    transform: translateY(40px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_7 {
-  50% {
-    transform: translateY(62px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-</style>
diff --git a/web/components/UserProfile/CallbackFeedback.vue b/web/components/UserProfile/CallbackFeedback.vue
index 0bd87e81a..edf7a7b3a 100644
--- a/web/components/UserProfile/CallbackFeedback.vue
+++ b/web/components/UserProfile/CallbackFeedback.vue
@@ -410,57 +410,3 @@ const showUpdateEligibility = computed(() => {
     </template>
   </Modal>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-
-.unraid_mark_2,
-.unraid_mark_4 {
-  animation: mark_2 1.5s ease infinite;
-}
-.unraid_mark_3 {
-  animation: mark_3 1.5s ease infinite;
-}
-.unraid_mark_6,
-.unraid_mark_8 {
-  animation: mark_6 1.5s ease infinite;
-}
-.unraid_mark_7 {
-  animation: mark_7 1.5s ease infinite;
-}
-
-@keyframes mark_2 {
-  50% {
-    transform: translateY(-40px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_3 {
-  50% {
-    transform: translateY(-62px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_6 {
-  50% {
-    transform: translateY(40px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_7 {
-  50% {
-    transform: translateY(62px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-</style>
diff --git a/web/components/UserProfile/DropdownLaunchpad.vue b/web/components/UserProfile/DropdownLaunchpad.vue
index f2ad5d52d..572071107 100644
--- a/web/components/UserProfile/DropdownLaunchpad.vue
+++ b/web/components/UserProfile/DropdownLaunchpad.vue
@@ -57,74 +57,3 @@ const showExpireTime = computed(
     </template>
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-
-.DropdownWrapper_blip {
-  box-shadow: var(--ring-offset-shadow), var(--ring-shadow), var(--shadow-foreground);
-
-  &::before {
-    @apply absolute z-20 block;
-
-    content: '';
-    width: 0;
-    height: 0;
-    top: -10px;
-    right: 42px;
-    border-right: 11px solid transparent;
-    border-bottom: 11px solid var(--color-popover);
-    border-left: 11px solid transparent;
-  }
-}
-
-.unraid_mark_2,
-.unraid_mark_4 {
-  animation: mark_2 1.5s ease infinite;
-}
-.unraid_mark_3 {
-  animation: mark_3 1.5s ease infinite;
-}
-.unraid_mark_6,
-.unraid_mark_8 {
-  animation: mark_6 1.5s ease infinite;
-}
-.unraid_mark_7 {
-  animation: mark_7 1.5s ease infinite;
-}
-
-@keyframes mark_2 {
-  50% {
-    transform: translateY(-40px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_3 {
-  50% {
-    transform: translateY(-62px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_6 {
-  50% {
-    transform: translateY(40px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-@keyframes mark_7 {
-  50% {
-    transform: translateY(62px);
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-</style>
diff --git a/web/components/UserProfile/ServerState.vue b/web/components/UserProfile/ServerState.vue
index b86f51b15..8b868420f 100644
--- a/web/components/UserProfile/ServerState.vue
+++ b/web/components/UserProfile/ServerState.vue
@@ -36,7 +36,7 @@ const upgradeAction = computed((): ServerStateDataAction | undefined => {
 
     <template v-if="purchaseAction">
       <UpcServerStateBuy
-        class="text-orange-dark relative top-px hidden sm:block"
+        class="text-orange-dark relative top-px hidden sm:!block"
         :title="t('Purchase Key')"
         @click="purchaseAction.click?.()"
       >{{ t('Purchase') }}</UpcServerStateBuy>
diff --git a/web/components/WanIpCheck.ce.vue b/web/components/WanIpCheck.ce.vue
index 174f43bbd..39e21ecfb 100644
--- a/web/components/WanIpCheck.ce.vue
+++ b/web/components/WanIpCheck.ce.vue
@@ -79,9 +79,3 @@ watchEffect(async () => {
     </template>
   </div>
 </template>
-
-<style >
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-</style>
diff --git a/web/components/Wrapper/web-component-plugins.ts b/web/components/Wrapper/web-component-plugins.ts
index d45663025..0fe5109ad 100644
--- a/web/components/Wrapper/web-component-plugins.ts
+++ b/web/components/Wrapper/web-component-plugins.ts
@@ -2,6 +2,9 @@ import { createI18n } from 'vue-i18n';
 import type { App } from 'vue';
 import { DefaultApolloClient } from '@vue/apollo-composable';
 
+// Import Tailwind CSS for web components shadow DOM injection
+import tailwindStyles from '~/assets/main.css?inline';
+
 import en_US from '~/locales/en_US.json';
 import { createHtmlEntityDecoder } from '~/helpers/i18n-utils';
 import { globalPinia } from '~/store/globalPinia';
@@ -46,4 +49,19 @@ export default function (Vue: App) {
 
   // Provide Apollo client for all web components
   Vue.provide(DefaultApolloClient, client);
-} 
+
+  // Inject Tailwind CSS into the shadow DOM
+  Vue.mixin({
+    mounted() {
+      if (typeof window !== 'undefined' && this.$el) {
+        const shadowRoot = this.$el.getRootNode();
+        if (shadowRoot && shadowRoot !== document && !shadowRoot.querySelector('style[data-tailwind]')) {
+          const styleElement = document.createElement('style');
+          styleElement.setAttribute('data-tailwind', 'true');
+          styleElement.textContent = tailwindStyles;
+          shadowRoot.prepend(styleElement);
+        }
+      }
+    }
+  });
+}
diff --git a/web/nuxt.config.ts b/web/nuxt.config.ts
index 7ca7f9896..7838fb6f3 100644
--- a/web/nuxt.config.ts
+++ b/web/nuxt.config.ts
@@ -34,6 +34,16 @@ console.log(dropConsole ? 'WARN: Console logs are disabled' : 'INFO: Console log
 
 const assetsDir = path.join(__dirname, '../api/dev/webGui/');
 
+/**
+ * Create a tag configuration
+ */
+const createWebComponentTag = (name: string, path: string, appContext: string) => ({
+  async: false,
+  name,
+  path,
+  appContext
+});
+
 /**
  * Shared terser options for consistent minification
  */
@@ -190,99 +200,30 @@ export default defineNuxtConfig({
       {
         name: 'UnraidComponents',
         viteExtend(config: UserConfig) {
-          return applySharedViteConfig(config, true);
+          const sharedConfig = applySharedViteConfig(config, true);
+          
+          // Optimize CSS while keeping it inlined for functionality
+          if (!sharedConfig.css) sharedConfig.css = {};
+          sharedConfig.css.devSourcemap = process.env.NODE_ENV === 'development';
+          
+          return sharedConfig;
         },
         tags: [
-          {
-            async: false,
-            name: 'UnraidAuth',
-            path: '@/components/Auth.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidConnectSettings',
-            path: '@/components/ConnectSettings/ConnectSettings.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidDownloadApiLogs',
-            path: '@/components/DownloadApiLogs.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidHeaderOsVersion',
-            path: '@/components/HeaderOsVersion.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidModals',
-            path: '@/components/Modals.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidUserProfile',
-            path: '@/components/UserProfile.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidUpdateOs',
-            path: '@/components/UpdateOs.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidDowngradeOs',
-            path: '@/components/DowngradeOs.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidRegistration',
-            path: '@/components/Registration.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidWanIpCheck',
-            path: '@/components/WanIpCheck.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidWelcomeModal',
-            path: '@/components/Activation/WelcomeModal.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidSsoButton',
-            path: '@/components/SsoButton.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidLogViewer',
-            path: '@/components/Logs/LogViewer.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidThemeSwitcher',
-            path: '@/components/ThemeSwitcher.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
-          {
-            async: false,
-            name: 'UnraidApiKeyManager',
-            path: '@/components/ApiKeyPage.ce',
-            appContext: '@/components/Wrapper/web-component-plugins',
-          },
+          createWebComponentTag('UnraidAuth', '@/components/Auth.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidConnectSettings', '@/components/ConnectSettings/ConnectSettings.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidDownloadApiLogs', '@/components/DownloadApiLogs.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidHeaderOsVersion', '@/components/HeaderOsVersion.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidModals', '@/components/Modals.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidUserProfile', '@/components/UserProfile.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidUpdateOs', '@/components/UpdateOs.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidDowngradeOs', '@/components/DowngradeOs.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidRegistration', '@/components/Registration.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidWanIpCheck', '@/components/WanIpCheck.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidWelcomeModal', '@/components/Activation/WelcomeModal.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidSsoButton', '@/components/SsoButton.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidLogViewer', '@/components/Logs/LogViewer.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidThemeSwitcher', '@/components/ThemeSwitcher.ce', '@/components/Wrapper/web-component-plugins'),
+          createWebComponentTag('UnraidApiKeyManager', '@/components/ApiKeyPage.ce', '@/components/Wrapper/web-component-plugins'),
         ],
       },
     ],
diff --git a/web/package.json b/web/package.json
index 776191387..bed352395 100644
--- a/web/package.json
+++ b/web/package.json
@@ -13,11 +13,12 @@
     "prebuild:dev": "pnpm predev",
     "build:dev": "nuxi build --dotenv .env.staging && pnpm run manifest-ts && pnpm run deploy-to-unraid:dev",
     "build:webgui": "pnpm run type-check && nuxi build --dotenv .env.production && pnpm run manifest-ts && pnpm run copy-to-webgui-repo",
-    "build": "NODE_ENV=production nuxi build --dotenv .env.production && pnpm run manifest-ts",
+    "build": "NODE_ENV=production nuxi build --dotenv .env.production && pnpm run manifest-ts && pnpm run validate:css",
     "prebuild:watch": "pnpm predev",
     "build:watch": "nuxi build --dotenv .env.production --watch && pnpm run manifest-ts",
     "generate": "nuxt generate",
     "manifest-ts": "node ./scripts/add-timestamp-webcomponent-manifest.js",
+    "validate:css": "node ./scripts/validate-custom-elements-css.js",
     "// Deployment": "",
     "unraid:deploy": "pnpm build:dev",
     "deploy-to-unraid:dev": "./scripts/deploy-dev.sh",
diff --git a/web/pages/index.vue b/web/pages/index.vue
index c3c227c3d..437323282 100644
--- a/web/pages/index.vue
+++ b/web/pages/index.vue
@@ -220,17 +220,3 @@ watch(
     <Toaster rich-colors close-button />
   </div>
 </template>
-
-<style>
-/* Import unraid-ui globals first */
-@import '@unraid/ui/styles';
-@import '~/assets/main.css';
-
-code {
-  @apply rounded-lg bg-gray-200 p-1 text-black shadow;
-}
-
-pre {
-  @apply overflow-x-scroll py-3;
-}
-</style>
diff --git a/web/scripts/validate-custom-elements-css.js b/web/scripts/validate-custom-elements-css.js
new file mode 100644
index 000000000..d9a042a4c
--- /dev/null
+++ b/web/scripts/validate-custom-elements-css.js
@@ -0,0 +1,158 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Recursively find JS files in a directory
+ */
+function findJSFiles(dir, jsFiles = []) {
+  if (!fs.existsSync(dir)) {
+    return jsFiles;
+  }
+
+  const items = fs.readdirSync(dir);
+  for (const item of items) {
+    const fullPath = path.join(dir, item);
+    const stat = fs.statSync(fullPath);
+    
+    if (stat.isDirectory()) {
+      findJSFiles(fullPath, jsFiles);
+    } else if (item.endsWith('.js')) {
+      jsFiles.push(fullPath);
+    }
+  }
+  return jsFiles;
+}
+
+/**
+ * Validates that Tailwind CSS styles are properly inlined in the JavaScript bundle
+ */
+function validateCustomElementsCSS() {
+  console.log('🔍 Validating custom elements JS bundle includes inlined Tailwind styles...');
+
+  try {
+    // Find the custom elements JS files
+    const customElementsDir = '.nuxt/nuxt-custom-elements/dist';
+    const jsFiles = findJSFiles(customElementsDir);
+
+    if (jsFiles.length === 0) {
+      throw new Error('No custom elements JS files found in ' + customElementsDir);
+    }
+
+    // Find the largest JS file (likely the main bundle with inlined CSS)
+    const jsFile = jsFiles.reduce((largest, current) => {
+      const currentSize = fs.statSync(current).size;
+      const largestSize = fs.statSync(largest).size;
+      return currentSize > largestSize ? current : largest;
+    });
+    console.log(`📁 Checking JS bundle: ${jsFile}`);
+
+    // Read the JS content
+    const jsContent = fs.readFileSync(jsFile, 'utf8');
+    
+    // Define required Tailwind indicators (looking for inlined CSS in JS)
+    const requiredIndicators = [
+      {
+        name: 'Tailwind utility classes (inline)',
+        pattern: /\.flex\s*\{[^}]*display:\s*flex/,
+        description: 'Basic Tailwind utility classes inlined'
+      },
+      {
+        name: 'Tailwind margin utilities (inline)',
+        pattern: /\.m-\d+\s*\{[^}]*margin:/,
+        description: 'Tailwind margin utilities inlined'
+      },
+      {
+        name: 'Tailwind padding utilities (inline)',
+        pattern: /\.p-\d+\s*\{[^}]*padding:/,
+        description: 'Tailwind padding utilities inlined'
+      },
+      {
+        name: 'Tailwind color utilities (inline)',
+        pattern: /\.text-\w+\s*\{[^}]*color:/,
+        description: 'Tailwind text color utilities inlined'
+      },
+      {
+        name: 'Tailwind background utilities (inline)',
+        pattern: /\.bg-\w+\s*\{[^}]*background/,
+        description: 'Tailwind background utilities inlined'
+      },
+      {
+        name: 'CSS custom properties',
+        pattern: /--[\w-]+:\s*[^;]+;/,
+        description: 'CSS custom properties (variables)'
+      },
+      {
+        name: 'Responsive breakpoints',
+        pattern: /@media\s*\([^)]*min-width/,
+        description: 'Responsive media queries'
+      },
+      {
+        name: 'CSS reset styles',
+        pattern: /\*[^}]*box-sizing|box-sizing[^}]*border-box/,
+        description: 'Tailwind CSS reset/normalize styles'
+      }
+    ];
+
+    // Validate each indicator
+    const results = [];
+    let allPassed = true;
+
+    for (const indicator of requiredIndicators) {
+      const found = indicator.pattern.test(jsContent);
+      results.push({
+        name: indicator.name,
+        description: indicator.description,
+        passed: found
+      });
+
+      if (!found) {
+        allPassed = false;
+      }
+    }
+
+    // Report results
+    console.log('\n📊 Validation Results:');
+    console.log('====================');
+    
+    for (const result of results) {
+      const status = result.passed ? '✅' : '❌';
+      console.log(`${status} ${result.name}`);
+      if (!result.passed) {
+        console.log(`   └─ Missing: ${result.description}`);
+      }
+    }
+
+    // File size check
+    const fileSizeKB = Math.round(fs.statSync(jsFile).size / 1024);
+    console.log(`\n📏 JS bundle size: ${fileSizeKB} KB`);
+    
+    if (fileSizeKB < 1000) {
+      console.log('⚠️  WARNING: JS bundle seems too small, inlined Tailwind styles might not be included');
+      allPassed = false;
+    } else {
+      console.log('✅ JS bundle size looks good');
+    }
+
+    // Final result
+    if (allPassed) {
+      console.log('\n🎉 SUCCESS: All Tailwind styles are properly inlined in the JS bundle!');
+      process.exit(0);
+    } else {
+      console.log('\n❌ FAILURE: Some Tailwind styles are missing from the JS bundle!');
+      console.log('\n💡 This might indicate:');
+      console.log('   - The CSS inline import in viteExtend is not working properly');
+      console.log('   - Tailwind configuration is not being processed');
+      console.log('   - CSS is not being injected into shadow DOM components');
+      process.exit(1);
+    }
+
+  } catch (error) {
+    console.error('\n❌ ERROR during validation:', error.message);
+    process.exit(1);
+  }
+}
+
+// Run the validation
+validateCustomElementsCSS();