Skip to content

Commit de9b41c

Browse files
authored
🔀 Merge pull request gchq#284 from Lissy93/FIX/283-item-hover-glitch
[FIX] Improves item layout, fixes hover bug Fixes gchq#283
2 parents cec78d1 + a3da4c7 commit de9b41c

File tree

1 file changed

+32
-12
lines changed

1 file changed

+32
-12
lines changed

src/components/LinkItems/Item.vue

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,8 @@ export default {
240240
</script>
241241

242242
<style lang="scss">
243+
@import '@/styles/style-helpers.scss';
244+
@import '@/styles/media-queries.scss';
243245
244246
.item-wrapper {
245247
flex-grow: 1;
@@ -269,10 +271,6 @@ export default {
269271
box-shadow: var(--item-hover-shadow);
270272
background: var(--item-background-hover);
271273
color: var(--item-text-color-hover);
272-
position: relative;
273-
.tile-title span.text {
274-
white-space: pre-wrap;
275-
}
276274
}
277275
&:focus {
278276
outline: 2px solid var(--primary);
@@ -292,11 +290,18 @@ export default {
292290
padding: 0;
293291
z-index: 2;
294292
display: -webkit-box;
295-
-webkit-line-clamp: 3;
293+
-webkit-line-clamp: 1;
296294
-webkit-box-orient: vertical;
297295
word-break: keep-all;
296+
&:not(.no-icon) {
297+
overflow: hidden;
298+
}
298299
span.text {
300+
text-overflow: ellipsis;
299301
white-space: nowrap;
302+
overflow: hidden;
303+
display: block;
304+
width: -webkit-fill-available;
300305
}
301306
}
302307
@@ -371,8 +376,7 @@ export default {
371376
margin-bottom: 0.25rem;
372377
}
373378
.tile-title {
374-
min-width: 100px;
375-
max-width: 160px;
379+
width: 100%;
376380
&.no-icon {
377381
text-align: left;
378382
width: 100%;
@@ -398,6 +402,7 @@ export default {
398402
.tile-title {
399403
height: auto;
400404
padding: 0.1rem 0.25rem;
405+
-webkit-line-clamp: 3;
401406
span.text {
402407
position: relative;
403408
font-weight: bold;
@@ -425,13 +430,28 @@ export default {
425430
}
426431
}
427432
428-
</style>
429-
430-
<!-- An un-scoped style tag, since tooltip is outside this DOM tree -->
431-
<style lang="scss">
432-
433433
.disabled-link {
434434
pointer-events: none;
435435
}
436436
437+
/* Modifications for more equal width on auto-layout. This is bad code. */
438+
.orientation-auto {
439+
.collapsable.col-1 .wrap-size-medium {
440+
max-width: 50%;
441+
}
442+
@include tablet-up {
443+
.collapsable.col-2 .wrap-size-medium {
444+
max-width: 25%;
445+
}
446+
}
447+
@include tablet-up {
448+
.collapsable.col-1 .wrap-size-small {
449+
min-width: 50%;
450+
}
451+
.collapsable.col-2 .wrap-size-small {
452+
min-width: 20%;
453+
}
454+
}
455+
}
456+
437457
</style>

0 commit comments

Comments
 (0)