Skip to content

Commit cd730ee

Browse files
committed
Adapt CmkCode dimensions to design
Change-Id: Iab820a0c3f7bfac4358aecb192eab85aab8228ae
1 parent 4f5d81c commit cd730ee

2 files changed

Lines changed: 41 additions & 51 deletions

File tree

packages/cmk-frontend-vue/src/assets/variables.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
/* Borders */
4545
--border-radius: 4px;
4646
--border-radius-half: 2px;
47+
--border-width-1: 1px;
4748

4849
/* Dimensions */
4950
--form-field-height: 21px;

packages/cmk-frontend-vue/src/components/CmkCode.vue

Lines changed: 40 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ conditions defined in the file COPYING, which is part of this source code packag
77
import { ref } from 'vue'
88
import CmkHeading from '@/components/typography/CmkHeading.vue'
99
import CmkIcon from '@/components/CmkIcon.vue'
10-
import CmkIconButton from '@/components/CmkIcon.vue'
10+
import CmkIconButton from '@/components/CmkIconButton.vue'
1111
import { Tooltip, TooltipContent, TooltipTrigger, TooltipProvider } from '@/components/tooltip'
1212
import usei18n from '@/lib/i18n'
1313
@@ -68,91 +68,80 @@ const handlePointerDownOutside = () => {
6868
<code>{{ code_txt.trimStart() }}</code>
6969
</pre>
7070
</div>
71-
<div class="icon_container">
72-
<TooltipProvider>
73-
<Tooltip :open="showMessage" disable-hover-trigger>
74-
<TooltipTrigger as-child @click="copyToClipboard">
75-
<div class="clone_icon_container">
76-
<CmkIconButton name="copied" variant="inline" size="medium" class="clone_icon" />
77-
</div>
78-
</TooltipTrigger>
79-
<TooltipContent
80-
side="top"
81-
align="center"
82-
as-child
83-
@pointer-down-outside="handlePointerDownOutside"
84-
>
85-
<div v-if="showMessage" class="tooltip-content" :class="{ error: !!errorMessage }">
86-
<CmkIcon
87-
:name="errorMessage ? 'cross' : 'checkmark'"
88-
variant="inline"
89-
size="medium"
90-
/>
91-
{{
92-
errorMessage
93-
? t('cmk-code-copy-error', 'Copy to clipboard failed with error: ') + errorMessage
94-
: t('cmk-code-copy-success', 'Copied to clipboard')
95-
}}
96-
</div>
97-
</TooltipContent>
98-
</Tooltip>
99-
</TooltipProvider>
100-
</div>
71+
<TooltipProvider>
72+
<Tooltip :open="showMessage" disable-hover-trigger>
73+
<TooltipTrigger as-child @click="copyToClipboard">
74+
<CmkIconButton name="copied" size="medium" class="clone_icon" />
75+
</TooltipTrigger>
76+
<TooltipContent
77+
side="top"
78+
align="center"
79+
as-child
80+
@pointer-down-outside="handlePointerDownOutside"
81+
>
82+
<div v-if="showMessage" class="tooltip-content" :class="{ error: !!errorMessage }">
83+
<CmkIcon :name="errorMessage ? 'cross' : 'checkmark'" variant="inline" size="medium" />
84+
{{
85+
errorMessage
86+
? t('cmk-code-copy-error', 'Copy to clipboard failed with error: ') + errorMessage
87+
: t('cmk-code-copy-success', 'Copied to clipboard')
88+
}}
89+
</div>
90+
</TooltipContent>
91+
</Tooltip>
92+
</TooltipProvider>
10193
</div>
10294
</template>
10395

10496
<style scoped>
10597
.cmk-code__heading {
106-
margin-bottom: var(--spacing);
98+
margin-bottom: 4px;
10799
color: var(--font-color);
100+
font-weight: 400;
108101
}
109102
110103
.code_wrapper {
111104
display: flex;
112105
align-items: center;
113106
margin-bottom: var(--spacing);
107+
gap: 8px;
114108
115109
.code_container {
116110
font-family: monospace;
117111
font-size: var(--font-size-normal, 12px);
118112
font-style: normal;
119113
font-weight: 400;
120114
line-height: normal;
121-
padding: var(--spacing);
122-
background: var(--ux-theme-0);
115+
padding: 8px 12px;
123116
color: var(--font-color);
124-
border-radius: var(--spacing-half);
117+
border-radius: var(--border-radius);
118+
border: var(--border-width-1, 1px) solid var(--ux-theme-0);
119+
background: var(--ux-theme-0);
125120
126121
pre {
127122
margin: 0;
128123
white-space: pre-line;
129124
}
130125
}
131126
132-
.icon_container {
127+
.clone_icon {
133128
display: flex;
134129
align-items: center;
135-
margin-left: var(--spacing);
136-
137-
.clone_icon_container {
138-
padding: var(--spacing-half);
139-
background-color: var(--color-corporate-green-50);
140-
border-radius: var(--spacing-half);
141-
cursor: pointer;
142-
143-
.clone_icon {
144-
margin-right: 0;
145-
}
146-
}
130+
justify-content: center;
131+
padding: 8px;
132+
border-radius: var(--border-radius);
133+
border: var(--border-width-1, 1px) solid var(--color-corporate-green-50);
134+
background: var(--color-corporate-green-50);
135+
cursor: pointer;
147136
}
148137
}
149138
150139
.tooltip-content {
151140
display: flex;
152141
align-items: center;
153-
gap: var(--spacing-half);
154-
padding: var(--spacing-half) var(--spacing);
155-
border-radius: var(--spacing-half);
142+
gap: var(--spacing);
143+
padding: 4px 8px;
144+
border-radius: var(--border-radius);
156145
background-color: var(--ux-theme-0);
157146
color: var(--font-color);
158147
white-space: nowrap;

0 commit comments

Comments
 (0)