Try to fix multiline ellipsis

[github/Chocobozzz/PeerTube.git] / client / src / sass / include / _mixins.scss

diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 3eefdb6fb054a2807f3ca703ff7869727c8ee319..900638a0e49a0167ccc4a1fa491a4ba96e575127 100644 (file)
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -24,22 +24,16 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
-/**
- *  This mixin will crop text in block for needed amount of lines and put ellipsis at the end
- *
- *  @param $font-size font-size property
- *  @param $line-height line-height property
- *  @param $lines-to-show amount of lines to show
- */
-@mixin ellipsis-multiline($font-size: 1rem, $line-height: 1, $lines-to-show: 2) {
+
+@mixin ellipsis-multiline($font-size: 16px, $number-of-lines: 2) {
   display: block;
   /* Fallback for non-webkit */
   display: -webkit-box;
-  max-height: $font-size * $line-height * $lines-to-show;
+  max-height: $font-size * $number-of-lines;
   /* Fallback for non-webkit */
   font-size: $font-size;
-  line-height: $line-height;
-  -webkit-line-clamp: $lines-to-show;
+  line-height: $font-size - 0.1;
+  -webkit-line-clamp: $number-of-lines;
   -webkit-box-orient: vertical;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -63,13 +57,25 @@
 
 @mixin apply-svg-color ($color) {
   /deep/ svg {
-    path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"], circle[fill="#000000"] {
+    path[fill="#000000"],
+    g[fill="#000000"],
+    rect[fill="#000000"],
+    circle[fill="#000000"],
+    polygon[fill="#000000"] {
       fill: $color;
     }
 
-    path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"], circle[stroke="#000000"] {
+    path[stroke="#000000"],
+    g[stroke="#000000"],
+    rect[stroke="#000000"],
+    circle[stroke="#000000"],
+    polygon[stroke="#000000"] {
       stroke: $color;
     }
+
+    stop[stop-color="#000000"] {
+      stop-color: $color;
+    }
   }
 }
 
@@ -515,3 +521,15 @@
     align-items: center;
   }
 }
+
+@mixin dropdown-with-icon-item {
+  padding: 6px 24px;
+
+  my-global-icon {
+    width: 24px;
+
+    margin-right: 10px;
+    position: relative;
+    top: -2px;
+  }
+}