Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#6754 truncatefy fix #6830

Merged
merged 10 commits into from
May 19, 2020
Merged

#6754 truncatefy fix #6830

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b4501e4
#6754 truncatefy fix
rationality6 Apr 30, 2020
21b8571
change element to span
rationality6 May 1, 2020
e67c964
changed siblings to same property
rationality6 May 1, 2020
5fce981
Revert "changed siblings to same property"
rationality6 May 1, 2020
1500a77
changed siblings to same property
rationality6 May 1, 2020
a7f9468
fixed with guideline
rationality6 May 5, 2020
1fa9cc5
fix
rationality6 May 12, 2020
dff5937
Revert "fix"
rationality6 May 13, 2020
68888ae
added white-space: nowrap
rationality6 May 13, 2020
22afae2
Merge remote-tracking branch 'origin/develop' into text_truncate_fix
jonboiser May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions packages/kolibri-components/src/KRadioButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
/>

<span class="text" dir="auto">
{{ label }}
<span
<div class="truncate-text">{{ label }}</div>
<div
v-if="description"
class="description"
:style="[{ color: disabled ? '' : $themeTokens.annotation }, disabledStyle ]"
>
{{ description }}
</span>
</div>
<slot></slot>
</span>

Expand Down Expand Up @@ -188,17 +188,20 @@
height: $radio-height;
}

.text,
.description {
display: inline-block;
}
.text {
display: inline-block;
max-width: calc(100% - #{$radio-height});
padding-left: 8px;
line-height: $radio-height;
}

.truncate-text {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.description {
width: 100%;
font-size: 12px;
line-height: normal;
}
Expand Down