Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
26,625 Commits 206 Branches 552 Tags 519 MiB
839851c90f
Commit Graph

26625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
839851c90f Fix bug where 'show more' sometimes did nothing 
a3a1e2e01f added the padding
to maxTilesPx which was confusing the calculation of whether we
should be showing the 'show more' button or the 'show less' button.

Hopefully this fixes the issue without undoing fixes from
https://github.com/matrix-org/matrix-react-sdk/pull/4964 or the
above commit by adding the padding in all cased in `get padding()`.
 2020-07-14 21:49:51 +01:00
J. Ryan Stinnett
225c31e043 Merge branch 'nadonomy/quick-wins' into 'element' 
Make message previews more legible

See merge request new-vector/element/element-web/matrix-react-sdk!18
 2020-07-14 18:10:30 +00:00
Nad Chishtie
1f9657c7fb Make message previews more legible 2020-07-14 19:05:49 +01:00
Travis Ralston
e955feb12d Revert "Merge pull request #4972 from matrix-org/travis/room-list/prelaunch/3-remove-debug" 
This reverts commit e1b34acdc8.
 2020-07-14 12:02:40 -06:00
Travis Ralston
4903ce55bb Merge branch 'travis/EL/appearance-tab' into 'element' 
Fix appearance tab saying the wrong theme is selected

See merge request new-vector/element/element-web/matrix-react-sdk!17
 2020-07-14 18:00:59 +00:00
Bruno Windels
37776447d4 Merge branch 'element-update-icons' into 'element' 
change icon on invite button

See merge request new-vector/element/element-web/matrix-react-sdk!16
 2020-07-14 17:54:07 +00:00
Travis Ralston
3a8b3e26ac Fix appearance tab saying the wrong theme is selected 
Fixes https://github.com/vector-im/riot-web/issues/14275
 2020-07-14 11:53:10 -06:00
Travis Ralston
941186dbc1 Merge branch 'travis/EL/communities-touchups' into 'element' 
Minor padding fixes to communities

See merge request new-vector/element/element-web/matrix-react-sdk!11
 2020-07-14 17:50:40 +00:00
Bruno Windels
aeadf64ccf change icon on invite button 2020-07-14 19:40:17 +02:00
Bruno Windels
9b94bf13c8 Merge branch 'element-darktheme-improvements' into 'element' 
Element dark theme improvements

See merge request new-vector/element/element-web/matrix-react-sdk!15
 2020-07-14 17:25:17 +00:00
Bruno Windels
0c3501e317 make field border less bright 2020-07-14 19:19:27 +02:00
Bruno Windels
4d14a1d6b3 change right panel/event tile hover bg color 2020-07-14 19:19:07 +02:00
Bruno Windels
c2456d9b81 change room header/timeline/composer bg 2020-07-14 19:18:42 +02:00
J. Ryan Stinnett
f452abf822 Merge branch 'jryans/font-text' into 'element' 
Fix font input branding

See merge request new-vector/element/element-web/matrix-react-sdk!14
 2020-07-14 17:08:20 +00:00
J. Ryan Stinnett
c0a552bfb0 Fix font input branding 2020-07-14 18:04:29 +01:00
Bruno Windels
41b7c8639c Merge branch 'element-rename-theme' into 'element' 
Rename element theme

See merge request new-vector/element/element-web/matrix-react-sdk!13
 2020-07-14 16:46:40 +00:00
Bruno Windels
b1444146e6 rename traces of element(-dark) theme in code 2020-07-14 18:40:32 +02:00
Bruno Windels
25d3257d80 rename element(-dark) to light/dark so old prefs apply 2020-07-14 18:39:14 +02:00
Bruno Windels
cad4029b1c Merge branch 'revert-d13ade6f' into 'element' 
Revert "Merge branch 'nadonomy/use-element-theme' into 'element'"

See merge request new-vector/element/element-web/matrix-react-sdk!12
 2020-07-14 16:23:37 +00:00
Bruno Windels
f47268ce74 Revert "Merge branch 'nadonomy/use-element-theme' into 'element'" 
This reverts merge request !9
 2020-07-14 16:23:06 +00:00
Travis Ralston
a5c8485e23 Minor padding fixes to communities 2020-07-14 10:16:00 -06:00
J. Ryan Stinnett
ea511faafe Merge remote-tracking branch 'origin/develop' into element 2020-07-14 16:57:00 +01:00
Travis Ralston
e1b34acdc8
Merge pull request #4972 from matrix-org/travis/room-list/prelaunch/3-remove-debug 
Remove debug logging from new room list
 2020-07-14 09:56:17 -06:00
Travis Ralston
00ee670077 Merge branch 'travis/room-list/EL-tagpanel-scroll' into 'element' 
Remove extraneous scrollbar on TagPanel when few communities are shown

See merge request new-vector/element/element-web/matrix-react-sdk!10
 2020-07-14 15:16:51 +00:00
Travis Ralston
d7e8dbbab5 Remove extraneous scrollbar on TagPanel when few communities are shown 2020-07-14 09:08:07 -06:00
Bruno Windels
ebbcbe231a Merge branch 'nadonomy/ui-tweaks-part-deux' into 'element' 
UI tweaks - part deux

See merge request new-vector/element/element-web/matrix-react-sdk!8
 2020-07-14 13:47:10 +00:00
J. Ryan Stinnett
5294349dc3 Remove base domain from instance name 2020-07-14 14:32:52 +01:00
Bruno Windels
d13ade6f89 Merge branch 'nadonomy/use-element-theme' into 'element' 
Use element theme by default

See merge request new-vector/element/element-web/matrix-react-sdk!9
 2020-07-14 13:25:41 +00:00
Nad Chishtie
d3944b9e67 Use element theme 2020-07-14 14:19:42 +01:00
Nad Chishtie
71dc6e8e10 Update missing var to use element theme 2020-07-14 14:15:24 +01:00
Bruno Windels
7ff3e6a26d bring back padding between show more and resize handle 2020-07-14 15:09:53 +02:00
Nad Chishtie
5b3c3f53fe Use element theme by default 2020-07-14 13:56:24 +01:00
Bruno Windels
b6a5fa38e1 Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux' 
# Conflicts:
#   res/css/views/rooms/_RoomSublist2.scss
 2020-07-14 12:40:52 +00:00
Nad Chishtie
9700e7e269 Tweak blur & alpha on panels 2020-07-14 13:35:31 +01:00
Bruno Windels
4f466300b7 Merge branch 'element' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into element 2020-07-14 14:32:08 +02:00
Bruno Windels
4fe4788c2e Merge branch 'develop' into element 2020-07-14 14:31:31 +02:00
Michael Telatynski
70951614e4 Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-14 13:30:55 +01:00
Michael Telatynski
fcf5fc0990 Fix normal e2e icon colour 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-14 13:30:05 +01:00
Bruno Windels
309c178d73
Merge pull request #4974 from matrix-org/jryans/sticky-pop 
Tweak sticky header hiding to avoid pop
 2020-07-14 12:29:53 +00:00
Bruno Windels
1180bb722a Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-14 14:25:36 +02:00
Bruno Windels
1578b1c3d3 different blur radius for dark theme 2020-07-14 14:24:35 +02:00
Michael Telatynski
9f199758b9 restore old tooltip positioning (right) instead of (above) for timeline tooltips 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-14 13:00:25 +01:00
Michael Telatynski
9c5f7492e3 undo changes which are no longer needed 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-14 12:53:55 +01:00
Michael Telatynski
507d493b60 Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-14 12:42:58 +01:00
Michael Telatynski
4e8203cca1 revert some changes to resolve what looks like a props mutation race-condition 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-14 12:42:51 +01:00
J. Ryan Stinnett
a09f773edd Tweak sticky header hiding to avoid pop 
When transitioning between sublists, there can be a visibly observable jump in
the positioning of list items when the header container is restored to normal
size outside of sticky mode.

To avoid this problem, this leaves all headers at normal size. This creates a
new issue of a permanent gap at the top of the list for the first header, but
this can be solved by always hiding (since it can only ever appear stuck to
top).

Fixes https://github.com/vector-im/riot-web/issues/14429
 2020-07-14 12:16:17 +01:00
Bruno Windels
c936439ad5 only remove underline for links in element theme 2020-07-14 12:52:28 +02:00
Bruno Windels
488f49dc5c redefine variable rather than picking a different one 
to not break other teams
 2020-07-14 12:51:51 +02:00
Michael Telatynski
0cb0d2a4eb Apply 1 suggestion(s) to 1 file(s) 2020-07-14 09:27:53 +00:00
Bruno Windels
106c91aec0 Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux' 
# Conflicts:
#   res/css/views/rooms/_RoomSublist2.scss
 2020-07-14 09:26:04 +00:00