Commit graph

4051 commits

Author SHA1 Message Date
David Baker
98ba3fd6e6
Merge pull request #6973 from matrix-org/dbkr/upgrade_highlightjs
Upgrade highlight.js
2021-10-18 19:52:34 +01:00
David Baker
2b7ea16c2d Upgrade highlight.js
Major version bump for highlight.js. Update usage of deprecated function & some cleanups.
2021-10-18 19:32:20 +01:00
Germain
77e6e1c0ab
Merge pull request #6960 from matrix-org/gsouquet/rename-replythread 2021-10-18 17:11:31 +01:00
David Baker
e0027895e7
Merge pull request #6963 from SimonBrandner/task/colors-5
Color clean-up numero cinco
2021-10-18 17:09:39 +01:00
Dariusz Niemczyk
a2bc090607
Fix threads with bubbles rendering (#6971)
Fixes https://github.com/vector-im/element-web/issues/18958
2021-10-18 15:41:05 +01:00
Andy Balaam
4f3d761984
Merge pull request #6968 from andybalaam/cryptographypanel-table
Convert CryptographyPanel to a table
2021-10-18 13:26:16 +01:00
Dariusz Niemczyk
1d6c9fa8da
Add threads ViewInRoom context button (#18955) (#6947) 2021-10-18 12:09:01 +00:00
Andy Balaam
61a5b495b7 Remove duplicate CSS selector 2021-10-18 12:23:09 +01:00
Andy Balaam
13d6456200 Convert CryptographyPanel to a table 2021-10-18 09:36:16 +01:00
Andy Balaam
f05e35bd94
Merge pull request #6958 from andybalaam/separate-cryptography-setting-component
Break 'Cryptography' settings into a separate component
2021-10-18 09:34:55 +01:00
Michael Telatynski
4d63e1239b
Merge pull request #6962 from CicadaCinema/patch-3 2021-10-18 09:17:40 +01:00
Germain
d93c220aae
Merge pull request #6898 from oliver-pham/issue-19180 2021-10-18 08:47:28 +01:00
Šimon Brandner
459f3661cf
Add a few fallback colors
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:56:02 +02:00
Šimon Brandner
6693ec3401
Reorder things to make it work
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:54:23 +02:00
Šimon Brandner
a3cde0e5e6
$voice-record-waveform-incomplete-fg-color -> $quaternary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:34:24 +02:00
Šimon Brandner
aad4e6f312
$voice-playback-button-bg-color -> $system
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:29:03 +02:00
Šimon Brandner
707f0c6bc9
$voice-playback-button-fg-color -> $secondary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:28:01 +02:00
Šimon Brandner
ee7c126596
$groupFilterPanel-divider-color -> $tertiary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:27 +02:00
Šimon Brandner
0794be1e98
$notice-secondary-color -> $tertiary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:27 +02:00
Šimon Brandner
ca6ed64811
$roomlist-header-color -> $tertiary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:26 +02:00
Šimon Brandner
79efd61b66
$roomsublist-divider-color -> $primary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:26 +02:00
Šimon Brandner
36531be8ca
$roomtile-preview-color -> $secondary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:26 +02:00
Šimon Brandner
1691127ad2
$field-focused-label-bg-color -> $background
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:20 +02:00
CicadaCinema
7b893366f2 Add spacing to Room settings - Notifications subsection 2021-10-16 14:52:29 +01:00
Germain Souquet
5a7c0d87b6 Rename ReplyThread to ReplyChain to avoid confusion with m.thread 2021-10-15 17:42:44 +01:00
Andy Balaam
0941b38b5d Name CryptographyPanel CSS classes consistent with style 2021-10-15 16:09:36 +01:00
David Baker
4fb0d021ae
Merge pull request #6897 from SimonBrandner/task/colors-4
Color de-duplication #4
2021-10-15 16:07:07 +01:00
Andy Balaam
a547ee4654 Break 'Cryptography' settings into a separate component 2021-10-15 16:02:44 +01:00
Faye Duxovni
1b7277b8f0
Merge pull request #6943 from matrix-org/fayed/emoji-compare-buttons
Update the button styling on the emoji comparison dialog during cross-signing
2021-10-15 10:34:25 -04:00
Šimon Brandner
0a6e78fd38
Merge remote-tracking branch 'upstream/develop' into task/colors-4 2021-10-15 16:23:40 +02:00
Šimon Brandner
ade53a5bd7
Do more re-ordering to keep things working
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-15 15:44:41 +02:00
Dariusz Niemczyk
f8c516d927
Add new thread message preview (#18958) (#6953)
Closes https://github.com/vector-im/element-web/issues/18958
2021-10-15 14:29:17 +01:00
Šimon Brandner
bc93954577
Remove repeated comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-15 15:24:19 +02:00
Šimon Brandner
71eeb836d9
Merge remote-tracking branch 'upstream/develop' into task/colors-4
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-15 15:23:32 +02:00
Andy Balaam
690893ea6b Merge duplicate CSS selectors 2021-10-15 13:32:39 +01:00
Andy Balaam
7edec291ac Switch DevicesPanel to use table (for screen readers) 2021-10-15 11:50:49 +01:00
Dariusz Niemczyk
562a880c7d
Create room threads list view (#6904)
Implement https://github.com/vector-im/element-web/issues/18957 following requirements:
* Create a new right panel view to list all the threads in a given room.
* Change ThreadView previous phase to be ThreadPanel rather than RoomSummary
* Implement local filters for My and All threads

In addition: 
* Create a new TileShape for proper rendering requirements (hiding typing indicator)
* Create new timelineRenderingType for proper rendering requirements
2021-10-14 15:27:35 +02:00
Michael Telatynski
4118d13846
Merge pull request #6829 from matrix-org/t3chguy/fix/18969 2021-10-14 09:59:34 +01:00
Michael Telatynski
2a3c483f96
Merge pull request #6919 from matrix-org/t3chguy/fix/19146 2021-10-14 09:58:19 +01:00
Faye Duxovni
8f10a1d3fb Update the button styling on the emoji comparison dialog during cross-signing
Signed-off-by: Faye Duxovni <fayed@element.io>
2021-10-14 00:46:15 -04:00
Travis Ralston
ea7257698c
Merge pull request #6934 from matrix-org/travis/labs/polls
Add feature flag for polls and placeholder dialog
2021-10-13 11:28:53 -06:00
Andy Balaam
e40413fa99
Merge pull request #6940 from andybalaam/devicespanel-css-in-devicespanel
Move the required CSS for DevicesPanel into its own scss file
2021-10-13 16:48:10 +01:00
Šimon Brandner
15076ce796
Fix issues with custom themes (#6937)
Fallback to non-custom colors in custom themes

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-13 16:43:01 +02:00
Andy Balaam
4e9a20db21 Move the required CSS for DevicesPanel into its own scss file
Signed-off-by: Andy Balaam <andyb@element.io>
2021-10-13 13:55:01 +01:00
Travis Ralston
71c5b02390 Add feature flag for polls and placeholder dialog
We're anticipating development of polls soon, so for efficiency reasons we're getting the labs flag in early. If something goes wrong with the plan, this whole change will be reverted.
2021-10-12 15:13:56 -06:00
Michael Telatynski
4416212d0b
Merge pull request #6926 from matrix-org/t3chguy/fix/18231 2021-10-12 14:03:12 +01:00
Michael Telatynski
d050c00703 Fix room list skeleton ui for narrow room list 2021-10-12 10:30:36 +01:00
Michael Telatynski
e54d803343 Tweak skeleton UI height to be more reasonable 2021-10-11 10:50:33 +01:00
Michael Telatynski
0d524ae70b Iterate invite your teammates to Space view 2021-10-11 10:43:37 +01:00
rom4nik
436996dc30
Prevent backdrop image from being selected 2021-10-11 02:21:09 +02:00