Commit graph

228 commits

Author SHA1 Message Date
Tulir Asokan
dfe277b78d Remove unnecessary right margin in reply blockquote 2020-05-25 19:24:23 +03:00
Tulir Asokan
4e5680de85 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-05-25 19:21:19 +03:00
Jorik Schellekens
6d9d4ee547 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-20 13:46:17 +01:00
Jorik Schellekens
3e30df17fb Slider is more responsive 2020-05-20 13:07:33 +01:00
Michael Telatynski
47ff67c6be
Merge pull request #4586 from matrix-org/revert-4448-t3chguy/imageview
Revert "ImageView make clicking off it easier"
2020-05-14 17:31:37 +01:00
Michael Telatynski
d1c6f3099c move styling to QRCode scss
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 11:20:06 +01:00
Jorik Schellekens
328bb7bcaf Remove all animations 2020-05-13 15:24:08 +01:00
Michael Telatynski
52e3c97f8c
Revert "ImageView make clicking off it easier" 2020-05-13 06:36:14 +01:00
Michael Telatynski
3bb800bb81 Replace png flags with use of Twemoji
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 22:04:18 +01:00
Jorik Schellekens
33a5b5142d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-07 18:01:20 +01:00
Jorik Schellekens
bab7d5f461 Some lints 2020-05-06 17:25:54 +01:00
Jorik Schellekens
a11812a402 Fix slider toggle regression. 2020-05-04 15:07:41 +01:00
Bruno Windels
8c28977c27
Merge pull request #4514 from JorikSchellekens/joriks/font-scaling-fixes
Fix pill vertical align
2020-04-29 10:07:44 +00:00
Jorik Schellekens
2e7ccf6e7a Fix pill vertical align 2020-04-29 10:57:35 +01:00
Jorik Schellekens
1b83faaa8d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-04-28 15:38:46 +01:00
Jorik Schellekens
cf05beb4b8
Merge pull request #4355 from JorikSchellekens/joriks/font-scaling-fixes
Fix scaling issues
2020-04-28 13:47:50 +01:00
Jorik Schellekens
a772d959a7 Remove redundent padding property and use em 2020-04-27 11:51:56 +01:00
Jorik Schellekens
669562b90c Extra right padding in user pills 2020-04-27 11:51:56 +01:00
Jorik Schellekens
a0b610c576 Skinnier pills are easier to swallow 2020-04-27 11:51:56 +01:00
Jorik Schellekens
5dc7703740 Undo superfluous delete 2020-04-27 11:51:56 +01:00
Jorik Schellekens
c7c94933ee Use font-variable instead of rem 2020-04-27 11:51:55 +01:00
Jorik Schellekens
6338325d5c Use rem instead of em. 2020-04-27 11:51:55 +01:00
Jorik Schellekens
997fe62e5c FIx lanugage selection alignment at scale. 2020-04-27 11:51:55 +01:00
Jorik Schellekens
0fe0d728f1 lint 2020-04-27 11:51:55 +01:00
Jorik Schellekens
633c6f6b5e Fix settings when scaling up 2020-04-27 11:51:55 +01:00
Jorik Schellekens
f59bd538b4 Resize toggle switches with font 2020-04-27 11:51:55 +01:00
Jorik Schellekens
e2aef3a62b Fix pills.
This was a hard pill to swallow
2020-04-27 11:51:54 +01:00
Michael Telatynski
4fc8fc9d6c cap width of editable item list item to leave space for its X remove button
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-26 12:52:17 +01:00
Jorik Schellekens
a16fe09d42 Use em to detach slider from root font-size 2020-04-23 10:58:00 +01:00
Jorik Schellekens
98799611cf Remove padding for alignment reasons 2020-04-23 10:45:48 +01:00
Jorik Schellekens
1486beeaf4 Make slider indpendent of settings styling 2020-04-23 10:45:48 +01:00
Jorik Schellekens
5f50facfba Make slider independant of label size 2020-04-23 10:45:48 +01:00
Jorik Schellekens
9a585fee0a Move slider themes 2020-04-23 10:45:48 +01:00
Jorik Schellekens
e10a511997 Extra right padding in user pills 2020-04-23 10:45:47 +01:00
Jorik Schellekens
fc04266b42 Skinnier pills are easier to swallow 2020-04-23 10:45:47 +01:00
Jorik Schellekens
18efbccceb Undo superfluous delete 2020-04-23 10:45:47 +01:00
Jorik Schellekens
07853f48bb Use font-variable instead of rem 2020-04-23 10:45:47 +01:00
Jorik Schellekens
c921859067 Use rem instead of em. 2020-04-23 10:45:47 +01:00
Jorik Schellekens
121b53f99a FIx lanugage selection alignment at scale. 2020-04-23 10:45:47 +01:00
Jorik Schellekens
5caec2a289 lint 2020-04-23 10:45:47 +01:00
Jorik Schellekens
0182128189 Fix settings when scaling up 2020-04-23 10:45:47 +01:00
Jorik Schellekens
cc601e1595 Resize toggle switches with font 2020-04-23 10:45:47 +01:00
Jorik Schellekens
1ff0f3445a Fix pills.
This was a hard pill to swallow
2020-04-23 10:45:46 +01:00
Michael Telatynski
80b8120bc3 Update login security copy and design to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 22:32:02 +01:00
Michael Telatynski
4494c6cf2b ImageView make clicking off it easier
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 11:21:51 +01:00
Michael Telatynski
4d91dc5bba iterate pills in rich text styling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-17 12:30:09 +01:00
Michael Telatynski
c3ff75d18f Don't break spills over multiple lines, ellipsis them at max-1-line
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-17 11:04:52 +01:00
Michael Telatynski
81f501e844 disable language dropdown too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:19:47 +01:00
Bruno Windels
368737cfd9 fix copyright 2020-04-14 17:41:06 +02:00
Bruno Windels
db09cadb66 remove spinner, change copy, add button placeholder 2020-04-14 17:19:15 +02:00