Commit graph

273 commits

Author SHA1 Message Date
David Baker
f928be6f59 Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"
This reverts commit ad47144355.
2019-01-03 15:37:03 -07:00
David Baker
982e037822 Fix merge 2019-01-03 18:05:38 +00:00
David Baker
7d161de35b Partial merge of develop to experimental
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
2019-01-03 15:02:58 +00:00
Nad Chishtie
09bf68b1bd Improved colours. 2018-12-20 12:46:43 +00:00
Nad Chishtie
42c8d43065 Lint. 2018-12-20 11:35:58 +00:00
Nad Chishtie
9b8f07c19f Don't override text colour of selected room in room list. 2018-12-20 11:35:43 +00:00
Nad Chishtie
d7473c4f4d Various colour, contrast and legibility improvements. 2018-12-20 11:35:21 +00:00
Nad Chishtie
6c2d2f60cf Polished left left panel. 2018-12-20 11:34:20 +00:00
Bruno Windels
f7ed1ff046 avoid buttons being deformed in collapsed state
unsure what this was doing before,
I suspect the BottomLeftMenu which is gone now.
2018-12-19 12:59:03 +01:00
Bruno Windels
b3a12867a6 remove extra blank lines 2018-12-19 12:56:08 +01:00
Bruno Windels
b826b0d998 Add redesign feedback dialog + button in tag panel 2018-12-19 12:27:05 +01:00
Bruno Windels
8b406eab3b
Merge pull request #2371 from matrix-org/bwindels/rmdot
Redesign: add badge with dot to rm button, to see it catches your eye better
2018-12-19 09:49:19 +00:00
Nad Chishtie
a829bc901c Updated CSS syntax to avoid 'transparent black'. 2018-12-18 17:59:46 +00:00
Bruno Windels
1d43712a8f Merge branch 'experimental' into nadonomy/icons 2018-12-18 18:22:24 +01:00
Bruno Windels
2ad9f45655 add badge with dot to rm button, so it catches your eye better 2018-12-18 17:56:05 +01:00
Nad Chishtie
074c96cd3e First pass of normalising icons. 2018-12-18 16:48:20 +00:00
Bruno Windels
f0a412e721 fix docs 2018-12-18 14:32:46 +01:00
Bruno Windels
12a339fe10 change subroomlist min height, as roomtiles are smaller now 2018-12-18 14:32:26 +01:00
Bruno Windels
affe75fd3f make scroll indicator gradient smaller (40px->30px) 2018-12-18 14:31:59 +01:00
Bruno Windels
0496ed535c have a bit more space between rooms 2018-12-17 14:35:11 +01:00
Bruno Windels
242b0c21ac make avatar 24px and tile height 32px 2018-12-17 14:03:48 +01:00
Bruno Windels
6c1639b2ce dont hardcode avatar container dimensions 2018-12-17 14:03:28 +01:00
Bruno Windels
e4d2b6f2b7 fix resize handles being too thick on edge (hopefully) 2018-12-14 17:06:00 +01:00
Bruno Windels
2afdb04db5 prevent jumping on when hovering over invited section 2018-12-14 17:05:01 +01:00
Bruno Windels
9f5a0250bf
Merge pull request #2345 from matrix-org/bwindels/jumptofirstunread-rebased
Redesign: restyle jump to first unread message & rework read marker logic (rebased)
2018-12-12 10:13:51 +00:00
Bruno Windels
e505a9e45c
Merge pull request #2343 from matrix-org/bwindels/addroombuttonalignment
Redesign: fix add room button alignment when collapsed
2018-12-12 09:21:12 +00:00
Bruno Windels
ac9902e52a apply redesign to topunreadmessagebar
with placeholder for message count
2018-12-11 15:43:00 +01:00
Bruno Windels
d3f655a064 fix avatar in edit mode 2018-12-11 13:11:26 +01:00
Bruno Windels
678a982bbb dont use more padding than needed so no shrinking happens (my guess) 2018-12-11 13:02:04 +01:00
Bruno Windels
a8f9a74920 make mygroups look slightly more in line with redesign 2018-12-10 17:55:30 +01:00
Bruno Windels
6488b01324 fix mergo-error 2018-12-10 17:48:11 +01:00
Bruno Windels
93767fa5f1 fix invite button layout 2018-12-10 17:46:22 +01:00
Bruno Windels
cc97b46908 fix group room tiles layout 2018-12-10 17:44:45 +01:00
Bruno Windels
ab728ead72 give group header some padding 2018-12-10 16:51:19 +01:00
Bruno Windels
f987a50fef make add community icon themeable and give it background so it's visible 2018-12-10 15:43:57 +01:00
Bruno Windels
fe76287035 style communities button, make it visible again 2018-12-10 15:43:48 +01:00
Bruno Windels
8f4292399b
Merge pull request #2297 from matrix-org/bwindels/roomlistsizingimprovements
Redesign: improve room sub list sizing & persist sizes
2018-11-27 13:40:48 +00:00
Bruno Windels
887defda9c temp solution to make room settings usable
make mx_fadable not do anything anymore, and make room settings
full size.

Room settings haven't been designed yet, so all of this will
have a full pass when we have a go at it.
2018-11-26 17:58:51 +01:00
Bruno Windels
257bac2b09 unrelated fix for searchbox being squashed by other roomlist content 2018-11-26 14:50:53 +01:00
Bruno Windels
61d9fe95e9 add 3 flex-shrink categories + make it work with overflow indicators 2018-11-26 14:50:29 +01:00
Bruno Windels
67e0030ccd Merge branch 'develop' into experimental 2018-11-26 13:10:29 +01:00
David Baker
6fe2c9c2bb Merge branch 'dbkr/e2e_backups' into dbkr/e2e_backups_passphrase 2018-11-20 18:10:57 +00:00
David Baker
8ccaf53d20 Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-11-20 18:08:39 +00:00
David Baker
132408cf02 Add e2e backup recovery with passphrase 2018-11-20 16:16:24 +00:00
David Baker
fbab8ceeef Passphrase based key backups
Add passphrase support to backup creation stage
2018-11-20 13:11:58 +00:00
Richard van der Hoff
c61031d3e1
Merge pull request #2279 from matrix-org/rav/sso_login_type
Support for m.login.sso
2018-11-19 14:14:21 +01:00
Travis Ralston
7dd610b41e
Merge pull request #2235 from MaxwellKepler/develop
Added badge to non-autoplay GIFs
2018-11-16 13:25:40 -07:00
Travis Ralston
8916c90fed Make the 'Accept' button for consent a little more friendly
Part of https://github.com/vector-im/riot-web/issues/7700
2018-11-15 20:26:37 -07:00
Richard van der Hoff
90f22c7b43 Support for m.login.sso
Adds support for the m.login.sso login type, which is handled the same way as
CAS, and also makes it look a bit nicer.
2018-11-15 19:05:39 +00:00
Travis Ralston
c8b38606cc Fix terms auth continue button CSS 2018-11-14 18:40:00 -07:00