Skip to content

Commit

Permalink
🔀 Merge pull request gchq#284 from Lissy93/FIX/283-item-hover-glitch
Browse files Browse the repository at this point in the history
[FIX] Improves item layout, fixes hover bug
Fixes gchq#283
  • Loading branch information
Lissy93 committed Oct 19, 2021
2 parents cec78d1 + a3da4c7 commit de9b41c
Showing 1 changed file with 32 additions and 12 deletions.
44 changes: 32 additions & 12 deletions src/components/LinkItems/Item.vue
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ export default {
</script>

<style lang="scss">
@import '@/styles/style-helpers.scss';
@import '@/styles/media-queries.scss';
.item-wrapper {
flex-grow: 1;
Expand Down Expand Up @@ -269,10 +271,6 @@ export default {
box-shadow: var(--item-hover-shadow);
background: var(--item-background-hover);
color: var(--item-text-color-hover);
position: relative;
.tile-title span.text {
white-space: pre-wrap;
}
}
&:focus {
outline: 2px solid var(--primary);
Expand All @@ -292,11 +290,18 @@ export default {
padding: 0;
z-index: 2;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
word-break: keep-all;
&:not(.no-icon) {
overflow: hidden;
}
span.text {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
display: block;
width: -webkit-fill-available;
}
}
Expand Down Expand Up @@ -371,8 +376,7 @@ export default {
margin-bottom: 0.25rem;
}
.tile-title {
min-width: 100px;
max-width: 160px;
width: 100%;
&.no-icon {
text-align: left;
width: 100%;
Expand All @@ -398,6 +402,7 @@ export default {
.tile-title {
height: auto;
padding: 0.1rem 0.25rem;
-webkit-line-clamp: 3;
span.text {
position: relative;
font-weight: bold;
Expand Down Expand Up @@ -425,13 +430,28 @@ export default {
}
}
</style>

<!-- An un-scoped style tag, since tooltip is outside this DOM tree -->
<style lang="scss">
.disabled-link {
pointer-events: none;
}
/* Modifications for more equal width on auto-layout. This is bad code. */
.orientation-auto {
.collapsable.col-1 .wrap-size-medium {
max-width: 50%;
}
@include tablet-up {
.collapsable.col-2 .wrap-size-medium {
max-width: 25%;
}
}
@include tablet-up {
.collapsable.col-1 .wrap-size-small {
min-width: 50%;
}
.collapsable.col-2 .wrap-size-small {
min-width: 20%;
}
}
}
</style>

0 comments on commit de9b41c

Please sign in to comment.