Skip to content

Commit 9c9a6ef

Browse files
committed
update components
1 parent 7ae3b28 commit 9c9a6ef

File tree

5 files changed

+30
-25
lines changed

5 files changed

+30
-25
lines changed

stubs/resources/js/Components/Form/AppCombobox.vue

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="w-48">
33
<AppButton
4-
class="btn btn-primary mb-2 flex w-full align-middle"
4+
class="btn btn-primary flex w-full align-middle"
55
aria-haspopup="true"
66
:aria-expanded="isOpen"
77
@click="toggleState"
@@ -47,17 +47,16 @@
4747
role="option"
4848
:aria-selected="index === highlightedIndex"
4949
>
50-
<a
51-
href="#"
52-
class="block px-4 py-2 text-sm hover:bg-skin-neutral-3 hover:text-skin-neutral-12"
50+
<span
51+
class="block px-4 py-2 text-sm hover:bg-skin-neutral-3 hover:text-skin-neutral-12 hover:cursor-pointer"
5352
:class="{
5453
'bg-skin-neutral-3 text-skin-neutral-12':
5554
index === highlightedIndex
5655
}"
5756
@click="updateModelValue(option)"
5857
>
5958
{{ option.label }}
60-
</a>
59+
</span>
6160
</li>
6261
</ul>
6362
</div>

stubs/resources/js/Components/Form/AppRadioButton.vue

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
<template>
22
<div class="mb-4 flex items-center">
3-
<input
4-
v-bind="$attrs"
5-
type="radio"
6-
:checked="isChecked"
7-
class="h-4 w-4 text-skin-primary-9 focus:ring-2 focus:ring-skin-primary-7"
8-
@change="$emit('update:modelValue', value)"
9-
/>
10-
<slot></slot>
3+
<AppLabel class="hover:cursor-pointer" :for="$attrs.id">
4+
<input
5+
v-bind="$attrs"
6+
type="radio"
7+
:checked="isChecked"
8+
class="h-4 w-4 text-skin-primary-9 hover:cursor-pointer focus:ring-2 focus:ring-skin-primary-7"
9+
@change="$emit('update:modelValue', value)"
10+
/>
11+
12+
<slot></slot>
13+
</AppLabel>
1114
</div>
1215
</template>
1316

stubs/resources/js/Components/Form/AppTipTapEditor.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
<textarea
281281
v-show="codeMode"
282282
v-model="htmlContent"
283-
class="min-h-[240px] w-full border-skin-neutral-7"
283+
class="min-h-[240px] w-full border border-solid border-skin-neutral-7 bg-skin-neutral-1 font-sans text-xs leading-5 tracking-normal"
284284
@input="syncEditor"
285285
>
286286
</textarea>
@@ -454,13 +454,14 @@ const addVideo = () => {
454454

455455
<style>
456456
.app-tip-tap-error {
457-
border: 1px solid red;
457+
border: 1px solid theme('colors.skin.error.DEFAULT');
458458
border-radius: 3px;
459459
}
460460
461461
.ProseMirror {
462462
min-height: 120px;
463463
padding: 5px 10px;
464+
background-color: theme('colors.skin.neutral.1');
464465
}
465466
466467
.ProseMirror p {
@@ -469,7 +470,7 @@ const addVideo = () => {
469470
470471
.ProseMirror a {
471472
text-decoration: underline;
472-
color: blue;
473+
color: theme('colors.skin.primary.11');
473474
}
474475
475476
/* Heading Sizes, See: https://tailwindcss.com/docs/font-size */
@@ -521,7 +522,7 @@ const addVideo = () => {
521522
.ProseMirror table td,
522523
.ProseMirror table th {
523524
min-width: 1em;
524-
border: 2px solid #ced4da;
525+
border: 2px solid theme('colors.skin.neutral.6');
525526
padding: 3px 5px;
526527
vertical-align: top;
527528
box-sizing: border-box;
@@ -535,7 +536,7 @@ const addVideo = () => {
535536
.ProseMirror th {
536537
font-weight: bold;
537538
text-align: left;
538-
background-color: #f1f3f5;
539+
background-color: theme('colors.skin.neutral.2');
539540
}
540541
541542
.ProseMirror .selectedCell:after {
@@ -556,7 +557,7 @@ const addVideo = () => {
556557
top: 0;
557558
bottom: -2px;
558559
width: 4px;
559-
background-color: #adf;
560+
background-color: theme('colors.skin.neutral.3');
560561
pointer-events: none;
561562
}
562563

stubs/resources/js/Components/Misc/AppButton.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ const emit = defineEmits(['click'])
3030
}
3131
3232
.btn-primary-outline {
33-
@apply border border-skin-primary-7 text-skin-primary-11 hover:bg-skin-primary-3 hover:text-skin-primary-12 focus-visible:outline-skin-primary-11;
33+
@apply border border-skin-primary-7 text-skin-primary-11 hover:bg-skin-primary-4 focus-visible:outline-skin-primary-11;
3434
}
3535
3636
.btn-neutral-outline {
37-
@apply border border-skin-neutral-7 text-skin-neutral-12 hover:bg-skin-neutral-3 focus-visible:outline-skin-neutral-12;
37+
@apply border border-skin-neutral-7 text-skin-neutral-12 hover:bg-skin-neutral-4 focus-visible:outline-skin-neutral-11;
3838
}
3939
4040
.btn-icon {

stubs/resources/js/Components/Overlay/AppConfirmDialog.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
<div
66
class="flex items-center justify-between rounded-t border-b border-skin-neutral-6 p-5"
77
>
8-
<h3 class="text-xl font-semibold lg:text-2xl">Confirmation</h3>
8+
<h3 class="text-xl font-semibold lg:text-2xl">
9+
{{ __('Confirmation') }}
10+
</h3>
911
<AppButton class="btn btn-neutral btn-icon" @click="closeModal">
1012
<i class="ri-close-line h-5 w-5"></i>
1113
</AppButton>
@@ -16,7 +18,7 @@
1618
<template #body>
1719
<div class="space-y-6 p-5">
1820
<p class="text-base leading-relaxed">
19-
Are you sure you want to proceed?
21+
{{ __('Are you sure you want to proceed?') }}
2022
</p>
2123
</div>
2224
</template>
@@ -27,11 +29,11 @@
2729
class="flex items-center justify-end space-x-2 rounded-b border-t border-skin-neutral-6 p-5"
2830
>
2931
<AppButton class="btn btn-neutral mr-3" @click="closeModal">
30-
Cancel
32+
{{ __('No') }}
3133
</AppButton>
3234

3335
<AppButton class="btn btn-destructive" @click="deleteItem()">
34-
Yes, delete
36+
{{ __('Yes') }}
3537
</AppButton>
3638
</div>
3739
</template>

0 commit comments

Comments
 (0)