diff options
| author | buoyantair <buoyantair@protonmail.com> | 2018-11-16 02:37:16 +0530 |
|---|---|---|
| committer | buoyantair <buoyantair@protonmail.com> | 2018-11-16 02:37:16 +0530 |
| commit | ae28cdf327d782e629379eee1999096ca2a5d74b (patch) | |
| tree | bfe0d4b3a232d75161fe5bba9196553a388fc02a /client/src/sass | |
| parent | d4681c0074ba51c62a3aeb9fb3f2cd071dd21e32 (diff) | |
| parent | 8cf998733496d44fa564e2e252356b871756c984 (diff) | |
| download | PeerTube-ae28cdf327d782e629379eee1999096ca2a5d74b.tar.gz PeerTube-ae28cdf327d782e629379eee1999096ca2a5d74b.tar.zst PeerTube-ae28cdf327d782e629379eee1999096ca2a5d74b.zip | |
Merge from upstream
Diffstat (limited to 'client/src/sass')
| -rw-r--r-- | client/src/sass/include/_mixins.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index b25d7ae0f..d6f391a45 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | display: block; | 29 | display: block; |
| 30 | /* Fallback for non-webkit */ | 30 | /* Fallback for non-webkit */ |
| 31 | display: -webkit-box; | 31 | display: -webkit-box; |
| 32 | max-height: $font-size*$line-height*$lines-to-show + 0.2; | 32 | max-height: $font-size * $line-height * $lines-to-show; |
| 33 | /* Fallback for non-webkit */ | 33 | /* Fallback for non-webkit */ |
| 34 | font-size: $font-size; | 34 | font-size: $font-size; |
| 35 | line-height: $line-height; | 35 | line-height: $line-height; |
| @@ -511,4 +511,4 @@ | |||
| 511 | } | 511 | } |
| 512 | } | 512 | } |
| 513 | } | 513 | } |
| 514 | } \ No newline at end of file | 514 | } |