Skip to content

Commit

Permalink
Merge pull request #10518 from Pursottam6003/RemoveTextTruncator
Browse files Browse the repository at this point in the history
Fixed Update #8532 Replace TextTruncator with TextTruncatorCss
  • Loading branch information
MisRob authored Apr 28, 2023
2 parents 9c10316 + 380327d commit c477af0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
<div v-if="message" class="message" :style="{ color: $themeTokens.text }">
{{ message }}
</div>
<TextTruncator
<TextTruncatorCss
v-if="!windowIsSmall"
:text="description"
:maxHeight="80"
:maxLines="3"
class="description"
/>
<div>
Expand All @@ -60,7 +60,7 @@
import CoachContentLabel from 'kolibri.coreVue.components.CoachContentLabel';
import ContentIcon from 'kolibri.coreVue.components.ContentIcon';
import { validateLinkObject, validateContentNodeKind } from 'kolibri.utils.validators';
import TextTruncator from 'kolibri.coreVue.components.TextTruncator';
import TextTruncatorCss from 'kolibri.coreVue.components.TextTruncatorCss';
import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin';
import CardThumbnail from './CardThumbnail';
Expand All @@ -69,7 +69,7 @@
components: {
CardThumbnail,
ContentIcon,
TextTruncator,
TextTruncatorCss,
CoachContentLabel,
},
mixins: [responsiveWindowMixin],
Expand Down
8 changes: 4 additions & 4 deletions kolibri/plugins/learn/assets/src/views/AlsoInThis.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@

<div class="content-meta">
<div class="text-and-time">
<TextTruncator
<TextTruncatorCss
class="content-title"
:text="content.title"
:maxHeight="72"
:maxLines="2"
/>
<TimeDuration
v-if="content.duration"
Expand Down Expand Up @@ -93,7 +93,7 @@
<script>
import isBoolean from 'lodash/isBoolean';
import TextTruncator from 'kolibri.coreVue.components.TextTruncator';
import TextTruncatorCss from 'kolibri.coreVue.components.TextTruncatorCss';
import TimeDuration from 'kolibri.coreVue.components.TimeDuration';
import KResponsiveWindowMixin from 'kolibri-design-system/lib/KResponsiveWindowMixin';
import MissingResourceAlert from 'kolibri-common/components/MissingResourceAlert';
Expand All @@ -107,7 +107,7 @@
components: {
LearningActivityIcon,
ProgressBar,
TextTruncator,
TextTruncatorCss,
TimeDuration,
MissingResourceAlert,
},
Expand Down

0 comments on commit c477af0

Please sign in to comment.