Skip to content

Commit 787d9f2

Browse files
committed
more tailwindcss v4 fixes
1 parent e2e97dd commit 787d9f2

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"copy-diffusion": "shx cp dist/servicestack-vue.m* ../../netcore/BlazorDiffusionVue/BlazorDiffusion/wwwroot/lib/mjs/ && shx cp dist/index.d.ts ../../netcore/BlazorDiffusionVue/BlazorDiffusion/wwwroot/lib/typings/@servicestack/vue/",
2626
"copy-creatorkit": "shx cp dist/servicestack-vue.m* ../../netcore/CreatorKit/CreatorKit/wwwroot/lib/mjs/ && shx cp dist/index.d.ts ../../netcore/CreatorKit/CreatorKit/wwwroot/lib/typings/@servicestack/vue/",
2727
"copy-aiserver": "shx cp dist/servicestack-vue.m* ../ai-server/AiServer/wwwroot/lib/mjs/ && shx cp dist/index.d.ts ../ai-server/AiServer/wwwroot/lib/typings/@servicestack/vue/",
28+
"copy-blazor-vue": "shx mkdir -p ../../NetCoreTemplates/blazor-vue/MyApp/wwwroot/js/ && shx cp dist/servicestack-vue.m* ../../NetCoreTemplates/blazor-vue/MyApp/wwwroot/js/ && shx cp dist/servicestack-vue.m* ../../NetCoreTemplates/blazor-vue/MyApp/wwwroot/lib/mjs/ && shx cp dist/index.d.ts ../../NetCoreTemplates/blazor-vue/MyApp/wwwroot/lib/typings/@servicestack/vue/",
2829
"preview": "vite preview",
2930
"build-only": "vite build -l error",
3031
"type-check": "vue-tsc --noEmit",

src/components/CloseButton.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="absolute top-0 right-0 pt-4 pr-4">
3-
<button type="button" @click="$emit('close')"
4-
:class="[buttonClass,'rounded-md text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:ring-offset-black']">
3+
<button type="button" @click="$emit('close')" :title="title"
4+
:class="[buttonClass,'cursor-pointer rounded-md text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:ring-offset-black']">
55
<span class="sr-only">Close</span>
66
<svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"
77
aria-hidden="true">
@@ -14,8 +14,10 @@
1414
<script setup lang="ts">
1515
const props = withDefaults(defineProps<{
1616
buttonClass?: string
17+
title?: string
1718
}>(), {
18-
buttonClass: 'bg-white dark:bg-black'
19+
buttonClass: 'bg-white dark:bg-black',
20+
title:'Close',
1921
})
2022
const emit = defineEmits<{
2123
(e:'close'): void

src/components/LookupInput.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ onMounted(async () => {
142142
: mapGet(model, refInfo.selfId)
143143
144144
const isRefType = isComplexType(refIdValue)
145-
console.log('refIdValue', refIdValue, isComplexType(refIdValue), model, refInfo)
145+
// console.log('refIdValue', refIdValue, isComplexType(refIdValue), model, refInfo)
146146
if (isRefType) {
147147
refIdValue = mapGet(model, refInfo.refId)
148148
}

src/components/ModalDialog.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div>
1111
<slot v-if="slots.closebutton" name="createform"></slot>
1212
<div v-else class="hidden sm:block absolute top-0 right-0 pt-4 pr-4 z-10">
13-
<button type="button" @click="close":class="closeButtonClass">
13+
<button type="button" @click="close":class="closeButtonClass" title="Close">
1414
<span class="sr-only">Close</span>
1515
<!-- Heroicon name: outline/x -->
1616
<svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
@@ -50,7 +50,7 @@ const props = withDefaults(defineProps<{
5050
id: 'ModalDialog',
5151
modalClass: css.modal.modalClass,
5252
sizeClass: css.modal.sizeClass,
53-
closeButtonClass: "bg-white dark:bg-black rounded-md text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:ring-offset-black",
53+
closeButtonClass: "bg-white dark:bg-black cursor-pointer rounded-md text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:ring-offset-black",
5454
})
5555
5656
const emit = defineEmits<{

src/components/SelectInput.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div :class="[$attrs.class]">
33
<label v-if="useLabel" :for="id" :class="`block text-sm font-medium text-gray-700 dark:text-gray-300 ${labelClass??''}`">{{ useLabel }}</label>
4-
<select :id="id" :name="id" :class="['mt-1 block w-full pl-3 pr-10 py-2 text-base focus:outline-none sm:text-sm rounded-md dark:text-white dark:bg-gray-900 dark:border-gray-600 disabled:bg-slate-50 disabled:text-slate-500 disabled:border-slate-200 disabled:shadow-none',
4+
<select :id="id" :name="id" :class="['mt-1 block w-full pl-3 pr-10 py-2 text-base focus:outline-none sm:text-sm rounded-md dark:text-white dark:bg-gray-900 dark:border-gray-600 disabled:bg-slate-50 dark:disabled:bg-slate-900 disabled:text-slate-500 disabled:border-slate-200 dark:disabled:border-slate-700 disabled:shadow-none',
55
!errorField ? 'shadow-sm border-gray-300 text-gray-900 focus:ring-indigo-500 focus:border-indigo-500' : 'border-red-300 text-red-900 focus:ring-red-500 focus:border-red-500',inputClass]"
66
:value="modelValue"
77
@input="$emit('update:modelValue', value($event.target))"

src/components/css.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const a = {
1616
indigo: 'text-indigo-600 dark:text-indigo-400 hover:text-indigo-800 dark:hover:text-indigo-200',
1717
}
1818
export const input = {
19-
base: 'block w-full sm:text-sm rounded-md dark:text-white dark:bg-gray-900 disabled:bg-slate-50 disabled:text-slate-500 disabled:border-slate-200 disabled:shadow-none',
19+
base: 'block w-full sm:text-sm rounded-md dark:text-white dark:bg-gray-900 disabled:bg-slate-50 dark:disabled:bg-slate-900 disabled:text-slate-500 disabled:border-slate-200 dark:disabled:border-slate-700 disabled:shadow-none',
2020
invalid: 'pr-10 border-red-300 text-red-900 placeholder-red-300 focus:outline-none focus:ring-red-500 focus:border-red-500',
2121
valid: 'shadow-sm focus:ring-indigo-500 focus:border-indigo-500 border-gray-300 dark:border-gray-600',
2222
}

0 commit comments

Comments
 (0)