Skip to content

Commit d4c4266

Browse files
committed
fix(checkin): adds ellipsis and disable wrap
1 parent b9f7118 commit d4c4266

File tree

4 files changed

+38
-14
lines changed

4 files changed

+38
-14
lines changed

src/components/container/ContainerComponent.ce.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ onBeforeMount(() => addCustomProgressProperty());
249249
&:hover {
250250
background: var(--custom-bg-color-hover, var(--bg-black-90));
251251
// stylelint-disable-next-line property-no-vendor-prefix -- necessary for safari
252-
-webkit-backdrop-filter: var(--custom-bg-blur-hover, var(--bg-blur-hover));
253-
backdrop-filter: var(--custom-bg-blur-hover, var(--bg-blur-hover));
252+
-webkit-backdrop-filter: blur(var(--custom-bg-blur-hover, var(--bg-blur-hover)));
253+
backdrop-filter: blur(var(--custom-bg-blur-hover, var(--bg-blur-hover)));
254254
}
255255
256256
@media (prefers-color-scheme: light) {

src/components/views/checkin/CheckinComponent.vue

+32-11
Original file line numberDiff line numberDiff line change
@@ -151,16 +151,16 @@ const onClick = () => {
151151
<NIcon class="icon" :component="icon" />
152152
<div class="column">
153153
<div class="top">
154-
<span class="text primary">{{ title }}</span>
154+
<span class="text primary ellipsis">{{ title }}</span>
155155
<span class="text tertiary compact">—</span>
156-
<span class="text secondary compact">{{ subtitle }}</span>
156+
<span class="text secondary compact ellipsis">{{ subtitle }}</span>
157157
<template v-if="episode">
158158
<span class="text tertiary">—</span>
159-
<span class="text secondary">{{ episode }}</span>
159+
<span class="text secondary ellipsis">{{ episode }}</span>
160160
</template>
161161
</div>
162162
<div v-if="!isTiny" class="bottom">
163-
<span class="tertiary">
163+
<span class="tertiary ellipsis">
164164
{{ type }} {{ action }} {{ i18n('at') }} {{ started }}
165165
</span>
166166
</div>
@@ -199,13 +199,16 @@ const onClick = () => {
199199
200200
.wrapper {
201201
position: relative;
202+
backdrop-filter: blur(var(--bg-blur-4));
203+
transition: backdrop-filter 0.5s var(--n-bezier);
204+
205+
&:active,
206+
&:hover {
207+
backdrop-filter: blur(var(--bg-blur-10));
208+
}
202209
203210
.background {
204-
@include mixin.hover-background(
205-
$from: var(--bg-trakt-50),
206-
$to: var(--bg-trakt-60),
207-
$blur-hover: var(--bg-blur-10)
208-
);
211+
@include mixin.hover-background($from: var(--bg-trakt-50), $to: var(--bg-trakt-60));
209212
210213
position: absolute;
211214
top: 0;
@@ -218,8 +221,7 @@ const onClick = () => {
218221
.container {
219222
@include mixin.hover-background(
220223
$from: var(--bg-trakt-dark-50),
221-
$to: var(--bg-trakt-dark-60),
222-
$blur-hover: var(--bg-blur-10)
224+
$to: var(--bg-trakt-dark-60)
223225
);
224226
225227
position: relative;
@@ -239,25 +241,43 @@ const onClick = () => {
239241
height: 100%;
240242
}
241243
244+
.left,
245+
.column {
246+
overflow: hidden;
247+
}
248+
242249
.left,
243250
.right,
244251
.top,
245252
.bottom {
246253
display: flex;
247254
gap: 0.25rem;
248255
align-items: center;
256+
white-space: nowrap;
249257
transition: gap 0.5s var(--n-bezier);
250258
}
251259
260+
.top,
261+
.bottom {
262+
overflow: hidden;
263+
text-overflow: ellipsis;
264+
}
265+
252266
.left {
253267
flex: 1 1 auto;
254268
}
255269
270+
.ellipsis {
271+
overflow: hidden;
272+
text-overflow: ellipsis;
273+
}
274+
256275
.column {
257276
display: flex;
258277
flex: 1 1 auto;
259278
flex-direction: column;
260279
gap: 0.125rem;
280+
padding-right: 0.5rem;
261281
}
262282
263283
.bottom {
@@ -304,6 +324,7 @@ const onClick = () => {
304324
}
305325
306326
.tertiary {
327+
overflow: hidden;
307328
color: var(--white-70);
308329
}
309330

src/styles/base.scss

+3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@
4848

4949
/* background color variables */
5050
--bg-blur: 1px;
51+
--bg-blur-2: 2px;
5152
--bg-blur-4: 4px;
53+
--bg-blur-6: 6px;
54+
--bg-blur-10: 10px;
5255
--bg-blur-20: 20px;
5356
--bg-blur-40: 40px;
5457
--bg-blur-hover: var(--bg-blur-20);

src/utils/watching.utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export const useCancelWatching = (cancel: () => unknown, action: TraktWatching['
6868
style: {
6969
width: '20rem',
7070
background: 'var(--bg-black-80)',
71-
backdropFilter: 'var(--bg-blur-10)',
71+
backdropFilter: 'blur(var(--bg-blur-4))',
7272
whiteSpace: 'pre-line',
7373
},
7474
positiveButtonProps: {

0 commit comments

Comments
 (0)