Skip to content

Commit b3efc99

Browse files
committed
Merge branch 'multisite-globals-selection' into multisite-configuration-improvements
Keep dynamic columnCount for origins-off configure, and sticky group headers.
2 parents 9b0e0ef + fbfe89d commit b3efc99

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

resources/js/components/globals/Sites.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<tbody>
7575
<template v-for="group in siteGroups" :key="group.key">
7676
<tr v-if="hasNamedGroups">
77-
<td :colspan="columnCount" class="bg-gray-50 py-2! dark:bg-gray-800">
77+
<td :colspan="columnCount" class="sticky top-[calc(--spacing(7)+1px)] z-(--z-index-above) bg-gray-50 py-2! dark:bg-gray-800">
7878
<div class="flex items-center gap-4 ps-1!">
7979
<Checkbox
8080
v-if="showOrigins"
@@ -97,14 +97,15 @@
9797
<td v-if="showOrigins" class="checkbox-column ps-3!">
9898
<Checkbox
9999
size="sm"
100+
class="pt-2.5"
100101
solo
101102
:model-value="isSelected(site.handle)"
102103
:label="__('Select :name', { name: __(site.name) })"
103104
@update:model-value="toggleSelection(site.handle, $event)"
104105
/>
105106
</td>
106107
<td class="grid-cell">
107-
<div class="flex items-center gap-2">
108+
<div class="flex pt-2 items-center gap-2">
108109
<Switch v-model="site.enabled" />
109110
<Heading :text="__(site.name)" />
110111
</div>

0 commit comments

Comments
 (0)