8017f0a4a1
Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real
2019-01-03 16:00:23 -07:00
6447a60e1f
Revert "Merge pull request #2336 from matrix-org/travis/notif-button"
...
This reverts commit 96300b45b7
2019-01-03 15:44:07 -07:00
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
982e037822
Fix merge
2019-01-03 18:05:38 +00:00
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
09bf68b1bd
Improved colours.
2018-12-20 12:46:43 +00:00
42c8d43065
Lint.
2018-12-20 11:35:58 +00:00
9b8f07c19f
Don't override text colour of selected room in room list.
2018-12-20 11:35:43 +00:00
d7473c4f4d
Various colour, contrast and legibility improvements.
2018-12-20 11:35:21 +00:00
6c2d2f60cf
Polished left left panel.
2018-12-20 11:34:20 +00:00
2e1e536d5c
Merge pull request #2347 from matrix-org/travis/custom-status
...
Custom status messages
2018-12-19 11:11:15 -07:00
24f0123ded
Convert pass phrase entry to flexbox
...
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
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
a22a9492a0
Remove duplicate CSS file for CreateKeyBackupDialog
...
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
a1347add95
Merge branch 'develop' into travis/custom-status
2018-12-19 10:33:34 -07:00
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
b3a12867a6
remove extra blank lines
2018-12-19 12:56:08 +01:00
b826b0d998
Add redesign feedback dialog + button in tag panel
2018-12-19 12:27:05 +01:00
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
a829bc901c
Updated CSS syntax to avoid 'transparent black'.
2018-12-18 17:59:46 +00:00
ef60a34180
Clean up and follow code style
2018-12-18 10:53:37 -07:00
1d43712a8f
Merge branch 'experimental' into nadonomy/icons
2018-12-18 18:22:24 +01:00
2ad9f45655
add badge with dot to rm button, so it catches your eye better
2018-12-18 17:56:05 +01:00
074c96cd3e
First pass of normalising icons.
2018-12-18 16:48:20 +00:00
f0a412e721
fix docs
2018-12-18 14:32:46 +01:00
12a339fe10
change subroomlist min height, as roomtiles are smaller now
2018-12-18 14:32:26 +01:00
affe75fd3f
make scroll indicator gradient smaller (40px->30px)
2018-12-18 14:31:59 +01:00
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
0496ed535c
have a bit more space between rooms
2018-12-17 14:35:11 +01:00
242b0c21ac
make avatar 24px and tile height 32px
2018-12-17 14:03:48 +01:00
6c1639b2ce
dont hardcode avatar container dimensions
2018-12-17 14:03:28 +01:00
7b0766a303
Apply 50% opacity to the checkmark when there is no status
2018-12-14 13:49:35 -07:00
e4d2b6f2b7
fix resize handles being too thick on edge (hopefully)
2018-12-14 17:06:00 +01:00
2afdb04db5
prevent jumping on when hovering over invited section
2018-12-14 17:05:01 +01:00
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
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
b0b7932f5f
Move status context menu to its own component
...
This fixes a lot of the state bugs such as buttons not updating, etc.
This commit also adds the border around the avatar to indicate a status is set.
2018-12-12 22:26:39 -07:00
99f5b9e39b
Misc cleanup of whitespace
2018-12-12 18:18:43 -07:00
a91963e5ee
Replace the avatar next to the composer with a status entry menu
...
The checkmark might change, and there appears to be some state tracking mishaps that need to be worked out.
Part of https://github.com/vector-im/riot-web/issues/1528
2018-12-12 18:03:30 -07:00
cd9ea2b2d7
Fix alignment of avatars and status messages
...
also introduce the status message to the MemberInfo pane
Part of https://github.com/vector-im/riot-web/issues/1528
2018-12-12 12:57:48 -07:00
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
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
ce7969e3d5
Display custom status messages in the UI
...
Part of https://github.com/vector-im/riot-web/issues/1528
2018-12-11 21:40:11 -07:00
ac9902e52a
apply redesign to topunreadmessagebar
...
with placeholder for message count
2018-12-11 15:43:00 +01:00
d3f655a064
fix avatar in edit mode
2018-12-11 13:11:26 +01:00
678a982bbb
dont use more padding than needed so no shrinking happens (my guess)
2018-12-11 13:02:04 +01:00
a8f9a74920
make mygroups look slightly more in line with redesign
2018-12-10 17:55:30 +01:00
6488b01324
fix mergo-error
2018-12-10 17:48:11 +01:00
93767fa5f1
fix invite button layout
2018-12-10 17:46:22 +01:00
cc97b46908
fix group room tiles layout
2018-12-10 17:44:45 +01:00
Travis Ralston