Skip to content
This repository was archived by the owner on Sep 24, 2024. It is now read-only.

Commit 7bd2c72

Browse files
SelemondevSelemondev
authored andcommitted
fix(app): button theme
1 parent f08d413 commit 7bd2c72

File tree

3 files changed

+55
-19
lines changed

3 files changed

+55
-19
lines changed

packages/nuxt-ui-vue/src/App.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22
</script>
33

44
<template>
5-
<div />
5+
<div class="grid place-items-center min-h-screen w-full">
6+
<UButton color="black" intent="solid" label="Button" />
7+
</div>
68
</template>

packages/nuxt-ui-vue/src/theme/nuxtLabsTheme.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,13 @@ export default {
196196

197197
UButton: {
198198
base: {
199-
root: 'focus:outline-none text-white dark:text-white block font-medium focus-visible:outline-0 rounded-md disabled:cursor-not-allowed disabled:opacity-75 flex-shrink-0 transition-all duration-200 ease-in',
199+
root: 'focus:outline-none block font-medium focus-visible:outline-0 rounded-md disabled:cursor-not-allowed disabled:opacity-75 flex-shrink-0 transition-all duration-200 ease-in',
200200
font: 'font-medium',
201201
rounded: 'rounded-md',
202202
block: 'w-full flex justify-center items-center',
203203
normal: 'inline-flex items-center',
204204
buttonLoading: '!bg-opacity-50 opacity-50 pointer-events-none !cursor-not-allowed !hover:bg-opacity-50 inline-flex items-center',
205-
buttonDisabled: '!shadow-none !cursor-not-allowed pointer-events-none opacity-50',
205+
buttonDisabled: '!shadow-none !cursor-not-allowed pointer-events-none !bg-opacity-50 opacity-50',
206206
truncate: 'text-left break-all line-clamp-1',
207207
size: {
208208
'2xs': 'text-xs',
@@ -238,8 +238,8 @@ export default {
238238
},
239239
color: {
240240
white: {
241-
solid: 'shadow-sm ring-1 ring-inset ring-gray-300 dark:ring-gray-700 text-gray-900 dark:text-white bg-white hover:enabled:bg-gray-50 disabled:bg-white dark:bg-gray-900 dark:hover:enabled:bg-gray-800/50 dark:disabled:bg-gray-900 focus-visible:ring-2 focus-visible:ring-green-500 dark:focus-visible:ring-green-400',
242-
ghost: 'text-gray-900 dark:text-white hover:enabled:bg-white dark:hover:enabled:bg-gray-900 focus-visible:ring-inset focus-visible:ring-2 focus-visible:ring-green-500 dark:focus-visible:ring-green-400',
241+
solid: 'shadow-sm ring-1 ring-inset ring-gray-300 dark:ring-gray-700 !text-gray-900 dark:text-white bg-white hover:enabled:bg-gray-50 disabled:bg-white dark:bg-gray-900 dark:hover:enabled:bg-gray-800/50 dark:disabled:bg-gray-900 focus-visible:ring-2 focus-visible:ring-green-500 dark:focus-visible:ring-green-400',
242+
ghost: '!text-gray-900 dark:text-white hover:enabled:bg-white dark:hover:enabled:bg-gray-900 focus-visible:ring-inset focus-visible:ring-2 focus-visible:ring-green-500 dark:focus-visible:ring-green-400',
243243
},
244244
gray: {
245245
solid: 'shadow-sm ring-1 ring-inset ring-gray-300 dark:ring-gray-700 text-gray-700 dark:text-gray-200 bg-gray-50 hover:enabled:bg-gray-100 disabled:bg-gray-50 dark:bg-gray-800 dark:hover:enabled:bg-gray-700/50 dark:disabled:bg-gray-800 focus-visible:ring-2 focus-visible:ring-green-500 dark:focus-visible:ring-green-400',
@@ -281,11 +281,11 @@ export default {
281281
variants: {
282282
default: {
283283
intent: {
284-
solid: 'shadow-sm text-white dark:text-gray-900 bg-{color}-500 hover:enabled:bg-{color}-600 disabled:bg-{color}-500 dark:bg-{color}-400 dark:hover:enabled:bg-{color}-500 dark:disabled:bg-{color}-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-{color}-500 dark:focus-visible:outline-{color}-400',
285-
outline: 'ring-1 ring-inset ring-current text-{color}-500 dark:text-{color}-400 hover:enabled:bg-{color}-50 disabled:bg-transparent dark:hover:enabled:bg-{color}-950 dark:disabled:bg-transparent focus-visible:ring-2 focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400',
286-
soft: 'text-{color}-500 dark:text-{color}-400 bg-{color}-50 hover:enabled:bg-{color}-100 disabled:bg-{color}-50 dark:bg-{color}-950 dark:hover:enabled:bg-{color}-900 dark:disabled:bg-{color}-950 focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400',
287-
ghost: 'text-{color}-500 dark:text-{color}-400 hover:enabled:bg-{color}-50 disabled:bg-transparent dark:hover:enabled:bg-{color}-950 dark:disabled:bg-transparent focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400',
288-
link: 'text-{color}-500 hover:enabled:text-{color}-600 disabled:text-{color}-500 dark:text-{color}-400 dark:hover:enabled:text-{color}-500 dark:disabled:text-{color}-400 underline-offset-4 hover:enabled:underline focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400',
284+
solid: 'shadow-sm text-white dark:text-gray-900 bg-{color}-500 hover:bg-{color}-600 disabled:bg-{color}-500 dark:bg-{color}-400 dark:hover:bg-{color}-500 dark:disabled:bg-{color}-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-{color}-500 dark:focus-visible:outline-{color}-400',
285+
outline: 'ring-1 ring-inset ring-current text-{color}-500 dark:text-{color}-400 hover:bg-{color}-50 disabled:bg-transparent dark:hover:bg-{color}-950 dark:disabled:bg-transparent focus-visible:ring-2 focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400',
286+
soft: 'text-{color}-500 dark:text-{color}-400 bg-{color}-50 hover:bg-{color}-100 disabled:bg-{color}-50 dark:bg-{color}-950 dark:hover:bg-{color}-900 dark:disabled:bg-{color}-950 focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400',
287+
ghost: 'text-{color}-500 dark:text-{color}-400 hover:bg-{color}-50 disabled:bg-transparent dark:hover:bg-{color}-950 dark:disabled:bg-transparent focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400',
288+
link: 'text-{color}-500 hover:text-{color}-600 disabled:text-{color}-500 dark:text-{color}-400 dark:hover:text-{color}-500 dark:disabled:text-{color}-400 underline-offset-4 hover:underline focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-{color}-500 dark:focus-visible:ring-{color}-400',
289289
},
290290
},
291291
},

packages/nuxt-ui-vue/tailwind.config.js

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,47 @@
1+
/* eslint-disable no-unused-expressions */
2+
import tailwindColors from './node_modules/tailwindcss/colors'
3+
4+
const colorSafeList = []
5+
6+
const deprecated = ['lightBlue', 'warmGray', 'trueGray', 'coolGray', 'blueGray']
7+
8+
for (const colorName in tailwindColors) {
9+
if (deprecated.includes(colorName))
10+
continue
11+
12+
const shades = [50, 100, 200, 300, 400, 500, 600, 700, 800, 900]
13+
14+
const pallette = tailwindColors[colorName]
15+
16+
if (typeof pallette === 'object') {
17+
shades.forEach((shade) => {
18+
if (shade in pallette) {
19+
colorSafeList.push(`text-${colorName}-${shade}`),
20+
colorSafeList.push(`accent-${colorName}-${shade}`),
21+
colorSafeList.push(`bg-${colorName}-${shade}`),
22+
colorSafeList.push(`hover:enabled:bg-${colorName}-${shade}`),
23+
colorSafeList.push(`focus:bg-${colorName}-${shade}`),
24+
colorSafeList.push(`ring-${colorName}-${shade}`),
25+
colorSafeList.push(`focus:ring-${colorName}-${shade}`),
26+
colorSafeList.push(`border-${colorName}-${shade}`)
27+
}
28+
})
29+
}
30+
}
131
/** @type {import('tailwindcss').Config} */
2-
export const content = ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}']
3-
export const darkMode = 'class'
4-
export const theme = {
5-
extend: {
6-
backgroundColor: ['disabled'],
7-
textColor: ['disabled'],
8-
fontFamily: {
9-
Roboto: 'Roboto',
32+
module.exports = {
33+
content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}'],
34+
darkMode: 'class',
35+
safelist: colorSafeList,
36+
theme: {
37+
extend: {
38+
colors: tailwindColors,
39+
backgroundColor: ['disabled'],
40+
textColor: ['disabled'],
41+
fontFamily: {
42+
Roboto: 'Roboto',
43+
},
1044
},
1145
},
46+
plugins: [require('@tailwindcss/forms')],
1247
}
13-
export const plugins = [require('@tailwindcss/forms')]

0 commit comments

Comments
 (0)