Skip to content

Commit d7f440f

Browse files
authored
Merge pull request #6377 from frappe/mergify/bp/master/pr-6376
fix(ui): analytic cards action btn alignments in site analytics (backport #6376)
2 parents e292ef5 + d75524c commit d7f440f

2 files changed

Lines changed: 14 additions & 2 deletions

File tree

dashboard/src/components/site/AnalyticsCard.vue

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
shouldHighlight && 'ring-1',
88
]"
99
>
10+
<<<<<<< HEAD
1011
<div class="flex h-12 items-center justify-between border-b px-5 gap-2">
1112
<div class="flex items-center">
1213
<h3 class="text-lg font-medium text-gray-900">{{ title }}</h3>
@@ -20,6 +21,17 @@
2021
</div>
2122
</div>
2223
<slot name="action"></slot>
24+
=======
25+
<div class="flex items-center border-b p-3 gap-2">
26+
<h3 class="text-base font-medium text-gray-900">{{ title }}</h3>
27+
<slot name="action"></slot>
28+
29+
<button @click="shareCard" class="flex items-center gap-1.5 ml-auto" aria-label="Copy">
30+
<LucideLink
31+
class="size-3 outline-none duration-200 hover:text-current cursor-pointer"
32+
/>
33+
</button>
34+
>>>>>>> cf6ae9eca (fix(ui): analytic cards action btn alignments in site analytics)
2335
</div>
2436

2537
<slot></slot>

dashboard/src/components/site/SiteAnalytics.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@
417417
</AnalyticsCard>
418418

419419
<AnalyticsCard
420-
class="sm:col-span-2"
420+
class='sm:col-span-2 [&_[aria-label="Copy"]]:m-0'
421421
title="Frequent Slow Queries"
422422
@share-card="shareDashboard"
423423
>
@@ -448,7 +448,7 @@
448448
</AnalyticsCard>
449449

450450
<AnalyticsCard
451-
class="sm:col-span-2"
451+
class='sm:col-span-2 [&_[aria-label="Copy"]]:m-0'
452452
title="Top Slow Queries"
453453
@share-card="shareDashboard"
454454
>

0 commit comments

Comments
 (0)