diff options
author | Chocobozzz <me@florianbigard.com> | 2023-02-27 15:59:16 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-02-27 15:59:16 +0100 |
commit | 2987c34e454aa4d1539e638a2f913097e0fd1edc (patch) | |
tree | 806b6eff2082bac5b7f36a08faeb389a9d674306 | |
parent | 1d74f89739248e36a482c68c33c67fd0c8e6671e (diff) | |
download | PeerTube-2987c34e454aa4d1539e638a2f913097e0fd1edc.tar.gz PeerTube-2987c34e454aa4d1539e638a2f913097e0fd1edc.tar.zst PeerTube-2987c34e454aa4d1539e638a2f913097e0fd1edc.zip |
Fix instance accordion line height
-rw-r--r-- | client/src/app/shared/shared-instance/instance-about-accordion.component.scss | 2 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/src/app/shared/shared-instance/instance-about-accordion.component.scss b/client/src/app/shared/shared-instance/instance-about-accordion.component.scss index 9174f40c7..ee9e4c3ee 100644 --- a/client/src/app/shared/shared-instance/instance-about-accordion.component.scss +++ b/client/src/app/shared/shared-instance/instance-about-accordion.component.scss | |||
@@ -6,7 +6,7 @@ | |||
6 | } | 6 | } |
7 | 7 | ||
8 | .instance-short-description { | 8 | .instance-short-description { |
9 | @include ellipsis-multiline(1rem, 3); | 9 | @include ellipsis-multiline(1rem, 3, inherit); |
10 | 10 | ||
11 | margin: 25px 0; | 11 | margin: 25px 0; |
12 | } | 12 | } |
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 8c173d5c9..e41fe9389 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -24,7 +24,7 @@ | |||
24 | text-overflow: ellipsis; | 24 | text-overflow: ellipsis; |
25 | } | 25 | } |
26 | 26 | ||
27 | @mixin ellipsis-multiline($font-size: 16px, $number-of-lines: 2) { | 27 | @mixin ellipsis-multiline($font-size: 16px, $number-of-lines: 2, $line-height: $font-size) { |
28 | display: block; | 28 | display: block; |
29 | /* Fallback for non-webkit */ | 29 | /* Fallback for non-webkit */ |
30 | display: -webkit-box; /* stylelint-disable-line value-no-vendor-prefix */ | 30 | display: -webkit-box; /* stylelint-disable-line value-no-vendor-prefix */ |
@@ -32,7 +32,7 @@ | |||
32 | -webkit-box-orient: vertical; | 32 | -webkit-box-orient: vertical; |
33 | /* Fallback for non-webkit */ | 33 | /* Fallback for non-webkit */ |
34 | font-size: $font-size; | 34 | font-size: $font-size; |
35 | line-height: $font-size; | 35 | line-height: $line-height; |
36 | overflow: hidden; | 36 | overflow: hidden; |
37 | text-overflow: ellipsis; | 37 | text-overflow: ellipsis; |
38 | max-height: $font-size * $number-of-lines; | 38 | max-height: $font-size * $number-of-lines; |