Skip to content

Commit 0d8d187

Browse files
committed
merge conflicts
1 parent deb745f commit 0d8d187

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

src/lib/components/regionEndpoint.svelte

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,34 @@
2121
</script>
2222

2323
{#if region}
24-
<Copy value={getProjectEndpoint()} copyText={`Copy endpoint (${region?.name})`}>
25-
<Tag size="xs" variant="code">
26-
<Layout.Stack direction="row" gap="s" alignItems="center" inline>
27-
<Icon icon={IconDuplicate} size="s" slot="start" />
28-
<span class="endpoint-label">API endpoint</span>
24+
<Copy value={getProjectEndpoint()} copyText={`Copy endpoint (${region?.name})`}>
25+
<Tag size="xs" variant="code">
26+
<Layout.Stack direction="row" gap="s" alignItems="center" inline>
27+
<Icon icon={IconDuplicate} size="s" slot="start" />
28+
<span class="endpoint-label">API endpoint</span>
2929

30-
{#if flagSrc}
31-
<img
32-
width={16}
33-
height={12}
34-
src={flagSrc}
35-
alt={region?.name}
36-
class="region-flag"
37-
style:border-radius="2.5px" />
38-
{/if}
30+
{#if flagSrc}
31+
<img
32+
width={16}
33+
height={12}
34+
src={flagSrc}
35+
alt={region?.name}
36+
class="region-flag"
37+
style:border-radius="2.5px" />
38+
{/if}
3939

40-
<span
41-
style:white-space="nowrap"
42-
class="text u-line-height-1-5"
43-
style:overflow="hidden"
44-
style:word-break="break-all"
45-
use:truncateText={region?.name}
46-
style:font-family="unset">
47-
{region?.name}
48-
</span>
49-
</Layout.Stack>
50-
</Tag>
51-
</Copy>
40+
<span
41+
style:white-space="nowrap"
42+
class="text u-line-height-1-5"
43+
style:overflow="hidden"
44+
style:word-break="break-all"
45+
use:truncateText={region?.name}
46+
style:font-family="unset">
47+
{region?.name}
48+
</span>
49+
</Layout.Stack>
50+
</Tag>
51+
</Copy>
5252
{/if}
5353

5454
<style>

0 commit comments

Comments
 (0)