]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Fix multiline ellipsis
authorChocobozzz <me@florianbigard.com>
Wed, 31 Mar 2021 09:47:47 +0000 (11:47 +0200)
committerChocobozzz <me@florianbigard.com>
Thu, 1 Apr 2021 14:54:49 +0000 (16:54 +0200)
client/src/app/shared/shared-video-miniature/video-miniature.component.scss
client/src/sass/include/_miniature.scss
client/src/sass/include/_mixins.scss

index cd492e9ad0b6bb1fc5daffa8574e4a364abcf354..a9628c696e62a58d5dbaa27ac8a5cb130734587d 100644 (file)
@@ -32,6 +32,8 @@ $more-margin-right: 15px;
 
       .video-miniature-name {
         @include miniature-name;
+
+        word-wrap: break-word;
         width: calc(100% - #{$more-button-width});
       }
 
index 42626344455de909c8f5f2b7a44d9ac8174e34dd..7643a6816b74495d2de67195e1b6dfade63488dd 100644 (file)
@@ -4,6 +4,7 @@
 @mixin miniature-name {
   @include ellipsis-multiline(1.1em, 2);
 
+  word-break: break-all;
   transition: color 0.2s;
   font-weight: $font-semibold;
   color: pvar(--mainForegroundColor);
@@ -226,22 +227,22 @@ $play-overlay-width: 18px;
 
   @media screen and (min-width: $mobile-view) {
     .videos {
-      --miniature-min-width: #{$video-thumbnail-width - 15px};
-      --miniature-max-width: #{$video-thumbnail-width};
+      --miniatureMinWidth: #{$video-thumbnail-width - 15px};
+      --miniatureMaxWidth: #{$video-thumbnail-width};
 
       display: grid;
       column-gap: 5px;
       grid-template-columns: repeat(
         auto-fill,
         minmax(
-          var(--miniature-min-width),
+          var(--miniatureMinWidth),
           1fr
         )
       );
 
       @media screen and (min-width: #{breakpoint(fhd)}) {
         column-gap: 1%;
-        --miniature-min-width: #{$video-thumbnail-width};
+        --miniatureMinWidth: #{$video-thumbnail-width};
       }
 
       .video-wrapper {
@@ -250,8 +251,8 @@ $play-overlay-width: 18px;
 
         my-video-miniature {
           display: block;
-          min-width: var(--miniature-min-width);
-          max-width: var(--miniature-max-width);
+          min-width: var(--miniatureMinWidth);
+          max-width: var(--miniatureMaxWidth);
         }
       }
     }
index 58920ce36a0cf5a4ad16729baabfb43865b7a8c0..eac2f1a7ff89e05364a2552690ad3ffa37f83e98 100644 (file)
   display: block;
   /* Fallback for non-webkit */
   display: -webkit-box;
-  max-height: $font-size * $number-of-lines;
+  -webkit-line-clamp: $number-of-lines;
   /* Fallback for non-webkit */
   font-size: $font-size;
   line-height: $font-size;
   overflow: hidden;
   text-overflow: ellipsis;
+  max-height: $font-size * $number-of-lines;
 }
 
 @mixin fade-text ($fade-after, $background-color) {