Skip to content

Commit 13bf704

Browse files
authored
Merge pull request #654 from devforth/feature/AdminForth/1699/revert-af-select-style-instead
fix: revert af select style, instead change just af-page-size-btn
2 parents 9e2b046 + aa1501e commit 13bf704

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

adminforth/spa/src/afcl/Select.vue

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,9 @@
1010
v-model="search"
1111
@click="inputClick"
1212
@input="inputInput"
13-
class="af-page-size-btn block w-full h-[34px] pl-3 pr-10 py-2 text-left
14-
text-sm font-medium transition-all border outline-none rounded-default
15-
bg-lightListViewButtonBackground text-lightListViewButtonText border-lightListViewButtonBorder
16-
placeholder-lightDropdownButtonsPlaceholderText dark:placeholder-darkDropdownButtonsPlaceholderText
17-
dark:bg-darkListViewButtonBackground dark:text-darkListViewButtonText dark:border-darkListViewButtonBorder
18-
dark:hover:text-darkListViewButtonTextHover dark:hover:bg-darkListViewButtonBackgroundHover
19-
hover:bg-lightListViewButtonBackgroundHover hover:text-lightListViewButtonTextHover"
13+
class="block w-full pl-3 pr-10 py-2.5 border border-lightDropownButtonsBorder rounded-md leading-5 bg-lightDropdownButtonsBackground
14+
placeholder-lightDropdownButtonsPlaceholderText text-lightDropdownButtonsText sm:text-sm transition duration-150 ease-in-out dark:bg-darkDropdownButtonsBackground dark:border-darkDropdownButtonsBorder dark:placeholder-darkDropdownButtonsPlaceholderText
15+
dark:text-darkDropdownButtonsText focus:ring-lightPrimary focus:border-lightPrimary dark:focus:ring-darkPrimary dark:focus:border-darkPrimary"
2016
:class="[{'cursor-pointer': searchDisabled}, classesForInput]"
2117
autocomplete="off" data-custom="no-autofill"
2218
:placeholder="

adminforth/spa/src/components/ResourceListTable.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,13 @@
353353
:style="{ width: selectDynamicWidth }"
354354
:placeholder="pageSizeInternal?.toString()"
355355
class="text-sm min-w-20 af-page-size-button"
356-
classesForInput="h-[34px] min-h-0 py-1 pl-2 pr-6 text-sm cursor-pointer af-button-shadow bg-lightDropdownButtonsBackground text-lightDropdownButtonsText border-lightDropdownButtonsBorder dark:bg-darkDropdownButtonsBackground dark:text-darkDropdownButtonsText dark:border-darkDropdownButtonsBorder rounded-default"
356+
classesForInput="
357+
af-page-size-btn h-[34px] min-h-0 py-1 pl-2 pr-6 text-left text-sm font-medium transition-all
358+
outline-none cursor-pointer af-button-shadow rounded-default bg-lightListViewButtonBackground
359+
text-lightListViewButtonText border-lightListViewButtonBorder
360+
dark:bg-darkListViewButtonBackground dark:text-darkListViewButtonText dark:border-darkListViewButtonBorder
361+
hover:bg-lightListViewButtonBackgroundHover hover:text-lightListViewButtonTextHover
362+
dark:hover:bg-darkListViewButtonBackgroundHover dark:hover:text-darkListViewButtonTextHover"
357363
/>
358364
</div>
359365
</div>

0 commit comments

Comments
 (0)