Michael Telatynski
e17318a364
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-09-16 10:05:20 +01:00
Travis Ralston
30972c597d
Merge pull request #6777 from robintown/room-list-scroll-jumps
...
Fix room list scroll jumps
2021-09-14 13:40:20 -06:00
Travis Ralston
fdb004b4e8
Merge pull request #6785 from robintown/message-bubble-misc
...
Fix various message bubble alignment issues
2021-09-14 13:26:03 -06:00
Travis Ralston
c3ad978941
Merge pull request #6795 from robintown/message-bubble-font-size
...
Make message bubble font size consistent
2021-09-14 13:25:28 -06:00
Robin Townsend
9b3da61ae4
Remove unnecessary unset
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-14 12:37:45 -04:00
Robin Townsend
8824b12064
Fix alignment of sender name in message bubble replies
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-14 12:35:51 -04:00
Robin Townsend
2c0835ed9b
Add comments to message bubble magic numbers
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-14 11:27:03 -04:00
Robin Townsend
35171ccd23
Merge branch 'develop' into message-bubble-misc
2021-09-14 11:00:55 -04:00
Dariusz Niemczyk
42a1048fde
Merge pull request #6794 from matrix-org/palid/fix/18997
...
Fix autocomplete not having y-scroll
2021-09-14 14:53:06 +02:00
Dariusz Niemczyk
527e1eb462
Fix autocomplete not having y-scroll
...
After changing flex-order the children did not have a max-height which
ended up in the child growing to outside of the screen instead of
being properly constrained.
Fix https://github.com/vector-im/element-web/issues/18997
2021-09-14 14:45:47 +02:00
Robin Townsend
465ce0820d
Make message bubble font size consistent
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-13 23:32:01 -04:00
Robin Townsend
8099791b32
Fix various message bubble alignment issues
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-11 11:43:36 -04:00
Eric Eastwood
049040b67d
Optimize input label transition on focus
...
Fix https://github.com/vector-im/element-web/issues/12876
2021-09-11 02:03:55 -05:00
Michael Telatynski
80fd960304
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-09-10 09:53:04 +01:00
Robin Townsend
07eafb9e3d
Fix room list scroll jumps
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-09 20:07:51 -04:00
Germain Souquet
aa53444267
Improve narrow composer usability
2021-09-09 13:27:25 +01:00
Michael Telatynski
29b4ba6675
Use new SCSS vars
2021-09-08 15:30:19 +01:00
Germain Souquet
bbf66a0011
Make label clickable on narrow mode context menu
2021-09-07 17:10:09 +01:00
Germain Souquet
646ef197fe
Fix PR UI defects
2021-09-07 16:02:26 +01:00
Travis Ralston
329292eb9b
Revert "Revert "Create narrow mode for Composer""
2021-09-06 22:11:35 -06:00
Travis Ralston
945181fe39
Revert "Create narrow mode for Composer"
2021-09-06 22:08:50 -06:00
Germain
59de3c96a2
Merge pull request #6682 from matrix-org/gsouquet/compact-composer-18533
2021-09-07 05:07:00 +01:00
Michael Telatynski
a688e5b8b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
...
Conflicts:
src/components/structures/LoggedInView.tsx
src/stores/SpaceStore.tsx
2021-09-06 11:41:09 +01:00
Germain
e7cfa4816e
Merge pull request #6582 from SimonBrandner/fix/bubble-highlight/18295
2021-09-06 09:56:16 +01:00
Germain Souquet
997f43cb82
Implement new narrow mode UI
2021-09-03 12:03:19 +01:00
Germain Souquet
e416952c90
Merge branch 'develop' into gsouquet/compact-composer-18533
2021-09-02 08:31:29 +01:00
Travis Ralston
f0cf00433b
Merge pull request #6702 from nordeck/nic/fix/even-tile-preview
...
Replace fake username in EventTilePreview with a proper loading state
2021-09-01 14:28:12 -06:00
Michael Telatynski
34e9443abc
Merge pull request #6722 from SimonBrandner/fix/autocomplete-dir
2021-09-01 14:45:30 +01:00
Šimon Brandner
4328ee18f5
Show autocomplete sections vertically
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-01 15:37:59 +02:00
Germain
7621a9a0f3
Merge pull request #6658 from matrix-org/gsouquet/threaded-messaging-2349
2021-09-01 08:47:10 +01:00
Steffen Kolmer
9fdc5659b7
Fixed eslint error and copyright header
2021-08-28 13:56:08 +02:00
Steffen Kolmer
d76adde1ab
Use scss instead of inline styles
2021-08-28 13:41:24 +02:00
Šimon Brandner
2d47f453cd
Update styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 16:19:46 +02:00
Šimon Brandner
e8bf7ac227
Merge remote-tracking branch 'upstream/develop' into fix/bubble-highlight/18295
2021-08-26 15:40:40 +02:00
Šimon Brandner
6003e12e48
Fix color name
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 15:12:26 +02:00
Šimon Brandner
408c327943
Merge remote-tracking branch 'upstream/develop' into fix/codeblock-border/18367
2021-08-26 15:11:46 +02:00
Germain Souquet
bd1aa01b67
Update copyright and method accessors
2021-08-26 08:19:44 +01:00
Travis Ralston
aa0a753105
Merge pull request #6681 from SimonBrandner/fix/codeblock-formatting
...
Fix codeblock formatting with syntax highlighting on
2021-08-25 13:36:47 -06:00
Germain Souquet
2d14be9cef
Merge branch 'develop' into gsouquet/compact-composer-18533
2021-08-25 18:07:36 +01:00
Šimon Brandner
9f791031a8
Fix codeblock formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-25 18:54:52 +02:00
Šimon Brandner
ecd45f7a81
Use min-height instead of height
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-25 18:38:36 +02:00
Travis Ralston
dc32df1ba5
Merge pull request #6639 from SimonBrandner/feature/voice-activity
...
Add active speaker indicators
2021-08-25 09:16:37 -06:00
Germain Souquet
31b3b2e2ed
Fix Sticker and Emoji picker opening on narrow mode
2021-08-25 15:39:50 +01:00
Germain Souquet
77a463e679
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-25 08:53:16 +01:00
Travis Ralston
49453f2d49
Merge pull request #6604 from SimonBrandner/task/colors-2
...
Color de-duplication #2
2021-08-24 12:37:18 -06:00
Germain Souquet
54a0a869bf
PR feedback
2021-08-24 09:09:28 +01:00
Šimon Brandner
751c57ecc2
Add some padding to the Add button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 10:05:24 +02:00
Šimon Brandner
2920da8b8b
Fix a merge regression
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 09:33:16 +02:00
Šimon Brandner
3d9a0286dc
Revert "$avatar-bg-color -> $background"
...
This reverts commit a3a6f73049
.
2021-08-24 09:04:17 +02:00
Šimon Brandner
bf87413442
Revert "$roomlist-header-color -> $tertiary-content"
...
This reverts commit 25a3a8ddfd
.
2021-08-24 09:02:17 +02:00