Commit graph

1457 commits

Author SHA1 Message Date
J. Ryan Stinnett
2769e68169 Give the create key backup title more space 2019-01-04 17:14:10 -06:00
J. Ryan Stinnett
97747640bb Record keys button styling tweak 2019-01-04 17:14:10 -06:00
Travis Ralston
93ea9d3617 Condense .mx_RoomTile_avatar properties
Looks like the develop->experimental merge duplicated the definition. We'll take the best of both and make it work.
2019-01-03 18:07:34 -07:00
Travis Ralston
852d6df580 Fix composer avatar being an oval when a custom status is set
Fixes this: 0d5c7fa9a4
2019-01-03 18:06:37 -07:00
Travis Ralston
51dc1fe9bf Fix badges on room tiles not being right aligned
Thanks to Ryan for fixing this!

Problem: da6fccb609
2019-01-03 18:05:59 -07:00
J. Ryan Stinnett
920911c0a1 Room list fixes for custom status 2019-01-03 18:49:15 -06:00
Travis Ralston
8017f0a4a1 Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real 2019-01-03 16:00:23 -07:00
Travis Ralston
6447a60e1f Revert "Merge pull request #2336 from matrix-org/travis/notif-button"
This reverts commit 96300b45b7.
2019-01-03 15:44:07 -07:00
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
Travis Ralston
2e1e536d5c
Merge pull request #2347 from matrix-org/travis/custom-status
Custom status messages
2018-12-19 11:11:15 -07:00
J. Ryan Stinnett
24f0123ded Convert pass phrase entry to flexbox
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
J. Ryan Stinnett
9c4ff4048a Convert show recovery key to flexbox
This allows the buttons to fit on a single line and flows a bit better at low
widths.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
J. Ryan Stinnett
a22a9492a0 Remove duplicate CSS file for CreateKeyBackupDialog
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
Travis Ralston
a1347add95 Merge branch 'develop' into travis/custom-status 2018-12-19 10:33:34 -07: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
Travis Ralston
ef60a34180 Clean up and follow code style 2018-12-18 10:53:37 -07: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
J. Ryan Stinnett
acc2e98355 Add New Recovery Method dialog
Adds a New Recovery Method dialog which is shown when key backup fails because
of a version mismatch / version not found error.

The set up button in the dialog currently only marks a device as verified (via a
verification prompt) instead of the eventual restore and cross-sign flow, since
those pieces don't exist yet.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-18 10:20:12 +00: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
Travis Ralston
7b0766a303 Apply 50% opacity to the checkmark when there is no status 2018-12-14 13:49:35 -07: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
J. Ryan Stinnett
15366fbb0a Change room recovery reminder button style
Change the button to a transparent background so that it's less prominent and
you focus on the primary button instead.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-13 16:36:55 +00:00
Travis Ralston
96300b45b7
Merge pull request #2336 from matrix-org/travis/notif-button
Show the number of unread notifications above the bell on the right
2018-12-13 08:16:48 -07:00
Bruno Windels
b0c84591d7 show focus glow below dialogs (at z-index 4000) 2018-12-13 13:01:59 +01:00
Bruno Windels
f593bff3c3 show right panel tabs inside panel instead of room header in grid mode 2018-12-13 13:01:59 +01:00
Bruno Windels
ec070ea782 use % instead of fr units for grid, make size independant of content 2018-12-13 13:01:59 +01:00
Bruno Windels
74becf71d8 add right panel back to grid view 2018-12-13 13:01:59 +01:00
Bruno Windels
2ceef00944 style active room rect, and make it not jump 2018-12-13 13:01:59 +01:00
Bruno Windels
cf0f75cad4 allow changing active room in grid by clicking it 2018-12-13 13:01:59 +01:00
Bruno Windels
fdd324a943 basic divider lines for tiles 2018-12-13 13:01:59 +01:00
Bruno Windels
d4748c91df add first draft of RoomGridView 2018-12-13 13:01:59 +01:00