PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
25177 commits 1 branch 0 tags 338 MiB
Commit graph

1806 commits

Author SHA1 Message Date
Travis Ralston
000c92a53f Merge branch 'develop' into travis/room-list/css-layout 2020-06-08 09:40:21 -06:00
Jorik Schellekens
2fe7c37566 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-unit-change 2020-06-08 13:37:05 +01:00
Travis Ralston
829bf3c774 Add another TODO comment 2020-06-05 14:11:04 -06:00
Travis Ralston
1d8833e9f8 Selected state, cleanup, and profile display 2020-06-05 14:08:20 -06:00
Travis Ralston
ea6b0a60ab Merge branch 'develop' into travis/room-list/css-layout 2020-06-05 13:19:00 -06:00
Travis Ralston
ee3d2c51d8
Merge pull request #4697 from matrix-org/travis/room-list/scrolling-resize 
New room list scrolling and resizing
 2020-06-05 13:17:59 -06:00
Travis Ralston
efa12b8c2f
Merge pull request #4687 from matrix-org/travis/split-left-panel 
Split the left panel into new and old for new room list designs
 2020-06-05 10:07:13 -06:00
Travis Ralston
475ba61671 Give the show more button some real CSS 
This is still somewhat placeholder.
 2020-06-05 08:48:23 -06:00
Travis Ralston
b31a8d494b Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout 2020-06-05 08:39:19 -06:00
Michael Telatynski
f221e06068
Merge pull request #4712 from matrix-org/t3chguy/compact-mode 
Fix compact layout regression
 2020-06-05 11:02:59 +01:00
Michael Telatynski
f4f23dba04 Fix compact layout regression 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-05 10:53:00 +01:00
Travis Ralston
e90e70bd77 Misc cleanup 2020-06-04 21:43:33 -06:00
Travis Ralston
f347019cf8 Remove obviously questionable color choices 2020-06-04 21:37:10 -06:00
Travis Ralston
0c15b2bdb6 Simple structuring of the room list itself 
This covers the larger parts of the design, but doesn't deal with the nuances of hover states, badge sizing, etc.
 2020-06-04 21:21:04 -06:00
Travis Ralston
4c1bc50649 Initial styling for new room list 
This is a work in progress, but covers the coarse areas. This uses all-new classes to better describe what everything is, and to reduce the number of selectors we keep track of.

This is primarily layout for the list and not actually the final structure. For example, some buttons are missing and other areas are not styled correctly - the idea in this commit was to get things roughly in the right place and work on it.
 2020-06-04 16:41:18 -06:00
Travis Ralston
02c131e3ff Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout 2020-06-04 16:40:55 -06:00
Travis Ralston
dc01607ad9 Merge branch 'develop' into travis/split-left-panel 2020-06-04 15:09:51 -06:00
Matthew Hodgson
c171bdfec7 fix emoji in safari 
1. emoji sometimes vanished from the autocompleter due to a rounding error
   combined with maxWidth: 1em on the emoji span kicking in at arbitrary
   font sizes/zooms
2. apparently safari needs explicit VS-16 ligatures, as per
   ff7dec427f
 2020-06-04 22:01:16 +01:00
Travis Ralston
2fe56276f2 css for vis 2020-06-04 10:07:41 -06:00
Jorik Schellekens
f6504d67ba Use 10px instead 2020-06-04 16:23:28 +01:00
Travis Ralston
cdf2d70aea Merge branch 'develop' into travis/room-list/scrolling-resize 2020-06-04 09:19:54 -06:00
Bruno Windels
aec588dada
Merge pull request #4691 from JorikSchellekens/joriks/fix-addressselector-dropdown-checkbox-overlap 
Stop checkbox styling bleeding through room address selector
 2020-06-04 09:16:45 +00:00
Travis Ralston
dbf996439b Wedge t3chguy's resizer prototype into the sublist 2020-06-03 21:17:51 -06:00
Travis Ralston
c07b5ebe9a Initial experiments with resizing of room lists 2020-06-03 21:17:18 -06:00
Michael Telatynski
bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons 
Center HeaderButtons
 2020-06-04 00:36:23 +01:00
Aaron Raimist
a4c9a67325 Delete files.png and change UploadConfirmDialog to use svg used elsewhere 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 17:23:37 -05:00
Aaron Raimist
711ddd42c9 Remove some unused images 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 17:23:37 -05:00
Aaron Raimist
3b5de137c4 Center HeaderButtons 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 17:23:23 -05:00
Michael Telatynski
eccacb1bc7
Merge pull request #4605 from matrix-org/t3chguy/e2eedefault 
Add .well-known option to control default e2ee behaviour
 2020-06-03 22:12:13 +01:00
Aaron Raimist
92c28f089c
Add max-width to right and left panels 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 14:56:48 -05:00
Michael Telatynski
3c922329fe
Merge pull request #4672 from matrix-org/matthew/emoji13 
upgrade to twemoji 13.0.0
 2020-06-03 17:09:32 +01:00
Jorik Schellekens
5bc756cba1 Fix checkbox bleed 2020-06-03 16:48:05 +01:00
Michael Telatynski
eb536ff2f7 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.js
	src/components/views/dialogs/InviteDialog.js
	src/components/views/right_panel/UserInfo.js
	src/createRoom.js
 2020-06-03 10:51:17 +01:00
Michael Telatynski
936445ab2d
Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD 
Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
 2020-06-03 10:45:47 +01:00
Travis Ralston
6d96d66c03 Split the left panel into new and old for new room list designs 
Though we consider the "room list" to mean the RoomList component specifically, the room list is actually the entire left panel as far as the user is concerned. 

The new proposed designs for the room list modify the whole left panel, so we had might as well break it into new and old now instead of later. This "new" left panel is a bare-bones implementation and meant to only provide the absolute basic feature set to function for those who enable the experimental room list, for whatever reason. This is not intended to be a final implementation, or even remotely close to what it could be. An example of this is the lack of breadcrumbs. Given they are likely to change, they are excluded from this temporary skeleton completely.

This also includes a purple/pink bar between the tag panel and left panel. This is so we can, if needed, differentiate between people who made the mistake of turning on the experimental room list while the overall aesthetic makes it indistinguishable. Once the designs are moderately approved, we can (and definitely should) remove the hideous indicator.
 2020-06-02 19:26:07 -06:00
Michael Telatynski
170acef796 Fix sizing of the security warning icon 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 21:54:38 +01:00
Michael Telatynski
d99babfe05 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 2020-06-02 21:51:05 +01:00
Jorik Schellekens
c0ac44e471 Change internal font size from from 15 to 20. 2020-06-02 17:10:22 +01:00
Michael Telatynski
3fbfb62bc9 Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer 2020-06-02 14:00:37 +01:00
Travis Ralston
613b994f9d
Revert "Prevent PersistedElements overflowing scrolled areas" 2020-06-02 00:21:31 -06:00
Michael Telatynski
d3523afd29 delint scss and i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 23:11:47 +01:00
Michael Telatynski
702bbe3bcd Add e2ee-default:false notice to Setting>Security 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 23:09:14 +01:00
Jorik Schellekens
50124d3476
Merge pull request #4675 from JorikSchellekens/joriks/fix-compact-layout-regression 
Increase specificity of compact layout selectors
 2020-06-01 18:11:52 +01:00
Jorik Schellekens
85978426c9 Fix selectors 2020-06-01 16:45:19 +01:00
Jorik Schellekens
03c6813425
Update res/css/views/rooms/_GroupLayout.scss 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2020-06-01 16:00:11 +01:00
Jorik Schellekens
b48818bb46 Increase specificity of compact layout selectors 2020-06-01 15:23:34 +01:00
Jorik Schellekens
69747b6114 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab 2020-06-01 14:32:31 +01:00
Jorik Schellekens
419857c29c
Merge pull request #4647 from JorikSchellekens/joriks/fix-filepanel-regression 
Fix FilePanel and NotificationsPanel regression
 2020-05-31 21:17:14 +01:00
Matthew Hodgson
9cdc1788b2 rebuild with emojibase-data 5 2020-05-31 16:04:15 +01:00
Matthew Hodgson
566d368c70 fix sbix as per 407a1f4b6d 2020-05-31 15:41:28 +01:00