Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider

This commit is contained in:
Jorik Schellekens 2020-04-28 15:38:46 +01:00
commit 1b83faaa8d
51 changed files with 1699 additions and 333 deletions

View file

@ -15,6 +15,6 @@ limitations under the License.
*/
// converts a pixel value to rem.
export function toRem(pixelVal) {
return pixelVal / 15 + "rem";
export function toRem(pixelValue) {
return pixelValue / 15 + "rem";
}