Skip to content

Commit cd8b54c

Browse files
committed
fix(panel): rework wording and fix overflow issues
1 parent b4cfb8e commit cd8b54c

File tree

5 files changed

+43
-42
lines changed

5 files changed

+43
-42
lines changed

src/components/common/typography/TextField.vue

+11-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ defineProps({
1515
labelWidth: {
1616
type: String,
1717
required: false,
18-
default: '2.5rem',
1918
},
2019
value: {
2120
type: [String, Number, Boolean],
@@ -90,7 +89,7 @@ const { openTab } = useLinksStore();
9089
<span class="prefix">{{ label }}</span>
9190
</slot>
9291
<slot>
93-
<NFlex v-if="array" class="value" wrap>
92+
<NFlex v-if="array" wrap align="center">
9493
<template v-if="values !== undefined">
9594
<TagLinkComponent
9695
v-for="(tag, i) of values"
@@ -117,7 +116,7 @@ const { openTab } = useLinksStore();
117116
.prefix {
118117
flex: 0 0 auto;
119118
align-self: center;
120-
min-width: var(--prefix-min-width);
119+
min-width: var(--prefix-min-width, 4rem);
121120
color: var(--white-50);
122121
font-weight: 600;
123122
transition: color 0.3s var(--n-bezier);
@@ -142,6 +141,10 @@ const { openTab } = useLinksStore();
142141
143142
&.vertical {
144143
width: 100%;
144+
145+
.prefix {
146+
min-width: var(--prefix-min-width, max-content);
147+
}
145148
}
146149
147150
&:hover .prefix {
@@ -155,6 +158,11 @@ const { openTab } = useLinksStore();
155158
&.array {
156159
flex: 1 1 auto;
157160
width: 100%;
161+
min-width: fit-content;
162+
163+
.prefix {
164+
align-self: baseline;
165+
}
158166
}
159167
160168
.pre {

src/components/views/panel/MoviePanelDetails.vue

+15-15
Original file line numberDiff line numberDiff line change
@@ -121,21 +121,29 @@ const movieTitle = computed(() => deCapitalise(movie?.value?.title));
121121
:placeholder="movieTitle"
122122
/>
123123
<NFlex class="row" size="large">
124-
<!-- Release date -->
125-
<TextField
126-
:label="i18n('released')"
127-
:value="releasedDate"
128-
:skeleton="{ width: '5.125rem' }"
129-
/>
130-
131124
<!-- Year -->
132125
<TextField :label="i18n('year')" :value="year" :skeleton="{ width: '2.25rem' }" />
133126

134127
<!-- Country -->
135128
<TextField :label="i18n('country')" :value="country" :skeleton="{ width: '2ch' }" />
129+
130+
<!-- Status -->
131+
<TextField
132+
:label="i18n('status')"
133+
:value="status"
134+
:skeleton="{ width: '7.5rem' }"
135+
grow
136+
/>
136137
</NFlex>
137138

138139
<NFlex class="row" size="large">
140+
<!-- Release date -->
141+
<TextField
142+
:label="i18n('released')"
143+
:value="releasedDate"
144+
:skeleton="{ width: '5.125rem' }"
145+
/>
146+
139147
<!-- Release Time -->
140148
<TextField
141149
:label="i18n('released_time')"
@@ -149,14 +157,6 @@ const movieTitle = computed(() => deCapitalise(movie?.value?.title));
149157
:value="runtime"
150158
:skeleton="{ width: '3.75rem' }"
151159
/>
152-
153-
<!-- Status -->
154-
<TextField
155-
:label="i18n('status')"
156-
:value="status"
157-
:skeleton="{ width: '7.5rem' }"
158-
grow
159-
/>
160160
</NFlex>
161161

162162
<NFlex v-if="watchedDate" class="row" size="large">

src/components/views/panel/PanelLinks.vue

+1-7
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,5 @@ const links = computed(() => {
146146
</script>
147147

148148
<template>
149-
<TextField
150-
:label="i18n('links')"
151-
:values="links"
152-
:skeleton="{ width: '3rem' }"
153-
array
154-
wrap
155-
/>
149+
<TextField :label="i18n('links')" :values="links" :skeleton="{ width: '3rem' }" array />
156150
</template>

src/components/views/panel/ShowPanelDetails.vue

+15-16
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ const title = computed(() =>
190190
:values="genres"
191191
:skeleton="{ width: '3rem' }"
192192
array
193-
wrap
194193
/>
195194

196195
<!-- links -->
@@ -224,20 +223,21 @@ const title = computed(() =>
224223
</NFlex>
225224

226225
<NFlex class="row" size="large">
227-
<!-- Air date -->
228-
<TextField
229-
:label="i18n('aired')"
230-
:value="airedDate"
231-
:skeleton="{ width: '5.125rem' }"
232-
/>
233-
234226
<!-- Runtime -->
235227
<TextField
236228
:label="i18n('runtime')"
237229
:value="runtime"
238230
:skeleton="{ width: '3.75rem' }"
239231
/>
240232

233+
<!-- Season aired episodes -->
234+
<TextField
235+
v-if="mode !== 'show'"
236+
:label="i18n('aired_episodes')"
237+
:value="airedEpisodes"
238+
:skeleton="{ width: '3rem' }"
239+
/>
240+
241241
<!-- Show Status -->
242242
<TextField
243243
:label="i18n('status')"
@@ -248,19 +248,18 @@ const title = computed(() =>
248248
</NFlex>
249249

250250
<NFlex class="row" size="large">
251-
<!-- Air Time -->
251+
<!-- Air date -->
252252
<TextField
253-
:label="i18n('aired_time')"
254-
:value="airedTime"
253+
:label="i18n('aired')"
254+
:value="airedDate"
255255
:skeleton="{ width: '5.125rem' }"
256256
/>
257257

258-
<!-- Season aired episodes -->
258+
<!-- Air Time -->
259259
<TextField
260-
v-if="mode !== 'show'"
261-
:label="i18n('aired_episodes')"
262-
:value="airedEpisodes"
263-
:skeleton="{ width: '3rem' }"
260+
:label="i18n('aired_time')"
261+
:value="airedTime"
262+
:skeleton="{ width: '5.125rem' }"
264263
/>
265264

266265
<!-- Episode Type -->

src/i18n/en/panel/panel-detail.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"description": "Runtime label in the panel detail"
5757
},
5858
"panel__detail__aired_episodes": {
59-
"message": "Aired Episodes",
59+
"message": "Episodes",
6060
"description": "Season Aired Episodes label in the panel detail"
6161
},
6262
"panel__detail__type": {

0 commit comments

Comments
 (0)