Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
42,834 Commits 1 Branch 646 Tags
7a80ea4bbe95adec14abc79a5bb8206cda170e61
Commit Graph

4378 Commits

Author SHA1 Message Date
Germain 50aee28bf0 Merge pull request #6480 from matrix-org/gsouquet/fix-18137 
Add data-layout to MELS for better CSS structure
 2021-07-27 13:15:02 +01:00
Michael Telatynski 0c79aec19d Fix broken layout of the space hierarchy view 
Not sure what this min-height was trying to achieve but removing it prevents the grid layout collapsing on itself
 2021-07-27 13:09:43 +01:00
Germain Souquet 8104ba936c Add data-layout to MELS for better CSS structure 2021-07-27 11:30:25 +02:00
Germain 80bf7d1675 Merge pull request #6468 from SimonBrandner/fix/quotes/18199 2021-07-27 09:48:19 +01:00
Germain 788abac74d Merge pull request #6471 from SimonBrandner/fix/voip-event-tiles/18216 
Fix VoIP event tile issues
 2021-07-27 08:17:31 +01:00
Jaiwanth b91309be82 Apply suggestions from review 2021-07-26 23:40:27 +05:30
Germain Souquet e2688cd5e0 Left align unbubbled events 2021-07-26 16:53:37 +02:00
Germain Souquet 486d576b23 Merge branch 'develop' into gsouquet/fix-18132 2021-07-26 15:49:55 +02:00
Germain Souquet 88bd22ded3 Make new reply UI clickable 2021-07-26 13:50:04 +02:00
Michael Telatynski 2114e854f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
 2021-07-26 12:36:00 +01:00
Šimon Brandner 7ed5dee74b Make colors a bit clearer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-26 13:17:06 +02:00
Šimon Brandner 277fdf1711 voipcall-plinth-color -> quinary-content-color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-26 12:42:18 +02:00
Šimon Brandner 40947a2a68 Simplifie toast handling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-26 12:21:58 +02:00
Germain Souquet 46a370a818 Fix deleted message left offset in the timeline 2021-07-26 11:01:37 +02:00
Germain Souquet 2577211855 Make CallEvent tiles the same width all the time 2021-07-26 09:42:17 +02:00
Jaiwanth 06d84a16d0 Delint 2021-07-26 12:58:17 +05:30
Germain Souquet 468887415a Merge branch 'develop' into gsouquet/fix-18144 2021-07-26 09:25:31 +02:00
Germain 774e743741 Update res/css/views/rooms/_EventBubbleTile.scss 2021-07-26 08:16:13 +01:00
Jaiwanth 30a64a1b5a Gray out and hide some options during export 2021-07-26 12:41:36 +05:30
Germain c7bbb497f9 Merge branch 'develop' into gsouquet/fix-18128 2021-07-26 07:41:42 +01:00
Germain 93ae5c20d6 Merge pull request #6464 from matrix-org/gsouquet/fix-18172 
Fix reactions row pushing content on IRC layout
 2021-07-26 07:40:49 +01:00
Jaiwanth b04bfeda33 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-07-26 00:18:56 +05:30
Jaiwanth 3d4d1d32d9 Modify design according to the design team 2021-07-26 00:09:59 +05:30
Šimon Brandner 3ef20174f3 Fix issues with the controls disappearing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 18:11:29 +02:00
Šimon Brandner 03a8308ae8 Fix call type icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 17:24:18 +02:00
Šimon Brandner aedd535c92 Correct iconography for missed calls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 08:37:25 +02:00
Šimon Brandner b762303102 Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 08:10:01 +02:00
Šimon Brandner f2204aa1ff Remove nonsense comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-24 21:12:29 +02:00
Šimon Brandner 1f9cd79bcf Fix some spacing and other tiny things 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-24 20:59:15 +02:00
Šimon Brandner 396fd2d012 Move silence button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-24 20:39:44 +02:00
Šimon Brandner 064544369a Add call type icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-24 19:30:37 +02:00
Šimon Brandner 25d62983de Add button icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-24 19:12:12 +02:00
Šimon Brandner a6f10a4aaa Move around some CSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-24 18:59:54 +02:00
Šimon Brandner dd800549d7 Fix the silence icon color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-24 14:06:52 +02:00
Šimon Brandner 24e6fc96f6 Reorganize content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-24 14:04:22 +02:00
Šimon Brandner c00174aacc Correct button sizes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-24 13:46:28 +02:00
Šimon Brandner af22588682 Don't use a spacer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-24 13:46:28 +02:00
Šimon Brandner 410928745f IncomingCallBox -> IncomingCallToast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-24 13:46:22 +02:00
Michael Telatynski 1ba601ba22 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/dialogs/BetaFeedbackDialog.tsx
 2021-07-23 18:28:21 +01:00
Šimon Brandner d206a0b8d3 Merge remote-tracking branch 'upstream/develop' into fix/quotes/18199 2021-07-23 18:39:42 +02:00
Šimon Brandner c6df7e4e41 Style markdown quotes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-23 17:46:49 +02:00
Michael Telatynski 4fe0e216d6 Use div instead of span for mx_MImageBody to not violate spec 2021-07-23 16:22:35 +01:00
Michael Telatynski 5f2582395f Fix blurhash rounded corners missing regression 2021-07-23 16:21:59 +01:00
Michael Telatynski b89434fcbc avoid abusing spans because you're too lazy to give things a class 2021-07-23 16:03:15 +01:00
Michael Telatynski dec2c48155 remove unused import and revert removing some needed css 2021-07-23 15:56:00 +01:00
Michael Telatynski 1d1a396c1f get rid of spurious hr 2021-07-23 15:51:59 +01:00
Michael Telatynski 7ccc429bea Change spaces beta feedback to not be so beta-centric 2021-07-23 15:47:11 +01:00
Michael Telatynski 9c7fa71a4a Remove spaces beta feedback prompts except a couple more strategic ones 2021-07-23 15:07:24 +01:00
Michael Telatynski c7a24746f5 Merge pull request #6462 from matrix-org/t3chguy/fix/18182 2021-07-23 14:52:56 +01:00
Germain Souquet 43f809ccc8 Fix call events layout for message bubble 2021-07-23 15:15:44 +02:00