c732ae3aa9
Correct license header
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-13 10:46:42 +01:00
03d735f4ed
Support changing your integration manager in the UI
...
Part of https://github.com/vector-im/riot-web/issues/10161
2019-08-12 15:40:50 -06:00
438eba1c46
Fix alignment of add email/phone number inputs in settings
2019-08-12 14:14:17 -06:00
bf9caa7fd8
add the rest of the files
2019-08-12 11:51:44 +01:00
c76514fceb
Add UI in settings to change ID Server
...
Just changes the current ID server being used
To come in subsequent PRs:
* Store this in account data
* Check for terms or support the proper UI for accepting terms when setting
* Support disconnecting
Part 1 of https://github.com/vector-im/riot-web/issues/10094
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1013
2019-08-09 18:07:58 +01:00
c2f81a00c4
Merge pull request #3288 from matrix-org/jryans/user-settings-toggle-3pid
...
Add controls for toggling discovery in user settings
2019-08-08 17:48:17 +01:00
178d6605c4
Add controls for toggling discovery in user settings
...
This adds controls for each 3PID to allow the user to choose whether it's bound
on the IS.
Fixes https://github.com/vector-im/riot-web/issues/10159
2019-08-08 11:35:35 +01:00
610baff09a
Merge pull request #2668 from azuenko/develop
...
Fix waste of space of collapsed left panel
2019-08-06 13:54:04 -06:00
f6dbeef204
Merge pull request #3257 from matrix-org/t3chguy/slashcommands_help
...
Add help slash command
2019-08-06 18:50:49 +01:00
1e8b304b3c
Remove /tint completely and dedup copyright
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-06 18:08:17 +01:00
ae834f8d05
Split out SlashCommandHelpDialog, group by category and style it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-06 18:03:38 +01:00
aa0a2a579e
Add copyright headers
2019-08-06 12:43:30 +01:00
a3eb45e0b9
Fix waste of space of collapsed left panel
...
Signed-off-by: Anton Zuenko <anton@zuenko.ru>
2019-08-05 18:03:20 +02:00
11f2b4320d
Update existing 3PID management UX
...
This tweaks the appearance of the existing 3PID management UX to use a different
style for the remove button. This styling will more closely match the soon to be
added 3PID discovery settings.
Part of https://github.com/vector-im/riot-web/issues/10159
2019-08-05 16:34:04 +01:00
701103aad7
Fix dialog button border colours
...
This corrects dialog button borders to match other buttons by removing the green
border from disabled and danger states.
Fixes https://github.com/vector-im/riot-web/issues/10310
2019-08-01 12:47:23 +01:00
c093b6ed9c
strikethrough & underline deletions & insertions
2019-07-31 14:44:48 +02:00
7296fb8fd3
Merge pull request #3243 from matrix-org/jryans/app-perm-url
...
Keep widget URL in permission screen to one line
2019-07-25 11:38:24 +01:00
a5ac50f90f
Merge pull request #3242 from matrix-org/jryans/terms-modal
...
Avoid visual glitch when terms appear for Integration Manager
2019-07-24 14:27:43 +01:00
ac31b4b8f4
Merge pull request #3244 from matrix-org/bwindels/diffhtmledits
...
Show diff for formatted messages in the edit history
2019-07-24 09:59:23 +00:00
3753e5261d
Implement diffing html messages in the edit history
2019-07-24 11:28:56 +02:00
2d4264c39d
Keep widget URL in permission screen to one line
...
This keeps the widget URL to one line max, so that the allow button will always
be visible. The full URL can be viewed by hovering.
Fixes https://github.com/vector-im/riot-web/issues/10402
2019-07-23 18:06:37 +01:00
39d5aa7cf4
Avoid visual glitch when terms appear for IM
...
This avoids a visual glitch where the Integration Manager portal would briefly
appear, but then be replaced by a smaller Terms dialog when there's something to
agree to.
To resolve this minimal code churn, this cheats a bit and customises the size of
the terms dialog to match the IM portal modal when terms are shown for IM
purposes.
Fixes https://github.com/vector-im/riot-web/issues/10386
2019-07-23 15:11:38 +01:00
2eb8a8879b
Merge pull request #3199 from matrix-org/dbkr/terms
...
ToS for ISes/IMs: prompt on use screen
2019-07-23 10:32:11 +01:00
f305d8ac08
Basic diff visualisation for plain text edits
2019-07-19 16:09:23 +02:00
fc8cdc5661
Improve interactive tooltip safe mousing area
...
This adds a more complex trapezoidal safe area between the button that triggers
the tooltip and the tooltip itself. It should be easier to move from the button
into the tooltip without accidentally closing it.
Fixes https://github.com/vector-im/riot-web/issues/10185
2019-07-17 14:11:27 +01:00
58a75949c3
Add a previous event safe area around action bar
...
This adds a previous event safe area so that you can't accidentally hover the
previous event while trying to mouse into the action bar or from the react
button to its tooltip.
Part of https://github.com/vector-im/riot-web/issues/10185
Fixes https://github.com/vector-im/riot-web/issues/9650
2019-07-17 10:10:08 +01:00
5ab958cc9f
Fix field styling regression
...
The extra comma in the selectors caused this rule set to be ignored.
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3200
Fixes https://github.com/vector-im/riot-web/issues/10311
2019-07-11 13:14:20 +01:00
9b3848d083
Merge pull request #3200 from matrix-org/jryans/stylelint-all-files
...
Run stylelint on all SCSS files
2019-07-11 09:38:18 +01:00
ca1e5bb3ae
Comment disabled rules
2019-07-11 09:30:01 +01:00
38d6953bf6
Manually fix remaining stylelint issues
2019-07-10 16:56:40 +01:00
dd2079bffc
Auto-fix stylelint issues
...
These `stylelint` issues were autofixed by the tool itself and look sane to me.
2019-07-10 16:56:40 +01:00
528b927638
Merge pull request #3196 from matrix-org/travis/fix-hover
...
Change highlight colour on dark theme
2019-07-10 07:52:14 -06:00
54aaabac74
Initial support for ToS dialogs for IS/IM
...
as per MSC2140
2019-07-09 18:51:56 +01:00
7b869f2824
Merge pull request #3182 from matrix-org/travis/soft-logout-rehydrate
...
Ask for the user's password to rehydrate their soft logged out session
2019-07-09 11:31:51 -06:00
2142826ffd
Change highlight colour on dark theme
...
Fixes https://github.com/vector-im/riot-web/issues/10248
2019-07-09 11:29:13 -06:00
7a482461dd
Merge pull request #3180 from matrix-org/bwindels/history-actions
...
Edit history actions
2019-07-08 08:19:27 +00:00
eb0e1eade4
Clamp reaction content width to at most 100px
...
Part of https://github.com/vector-im/riot-web/issues/10256
2019-07-05 16:18:16 +01:00
93872e6fa5
Ask for the user's password to rehydrate their soft logged out session
...
Fixes https://github.com/vector-im/riot-web/issues/10236
The changes to the MatrixClientPeg (assign/start) are to permit the SoftLogout page to access the MatrixClientPeg reliably. This is why assign() is called by Lifecycle as an alternative to start().
Minimal design work has been done here. The majority is deferred to https://github.com/vector-im/riot-web/issues/10262
2019-07-04 16:51:16 -06:00
375976575b
add redact button
2019-07-04 11:07:22 +02:00
344cc079c5
show /relations error in edit history dialog
2019-07-03 12:16:58 +02:00
353f5a205c
Merge pull request #3170 from matrix-org/bwindels/handle-associated-failures
...
Handle associated event send failures
2019-07-03 09:02:58 +00:00
cca82635f3
whitespace
2019-07-03 10:32:37 +02:00
cf8eeedcc7
Merge pull request #3169 from matrix-org/jryans/reactions-tooltip-tweaks
...
Improve interactive tooltip hover behaviour
2019-07-02 18:28:09 +01:00
fc3c4fccc2
set background on highlighted messages
2019-07-02 18:31:11 +02:00
7fc1288614
Fix login type selector border
...
This fixes a regression in the login type selector's border and placement.
Fixes https://github.com/vector-im/riot-web/issues/10223
2019-07-02 15:09:51 +01:00
dd94bf799d
Improve interactive tooltip hover behaviour
...
This gives the interactive tooltip a more natural hover behaviour by removing
the full screen div behind it. This allows the target button to keep its hover
state, for example.
This also removes the click to close behaviour, which was too easy to trigger
accidentally.
Fixes https://github.com/vector-im/riot-web/issues/10179
Fixes https://github.com/vector-im/riot-web/issues/10222
Fixes https://github.com/vector-im/riot-web/issues/10225
2019-07-01 18:00:59 +01:00
1af8da4a4a
change lozenge color of unsent redacted events to red
...
use css vars so we don't have to repeat the whole lozenge style
2019-07-01 11:06:55 +02:00
49b89217a3
MemberInfo wrap Device Name/ID
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-30 19:21:19 +01:00
33425240f6
Merge pull request #3152 from matrix-org/jryans/reactions-show-all
...
Limit reactions row on initial display
2019-06-28 15:12:48 +01:00
9be40a27fc
Merge pull request #3154 from matrix-org/travis/syntax-error
...
Flexboxify generic error page
2019-06-27 14:09:57 -06:00
7e8eda33fc
Flexboxify generic error page
2019-06-27 12:10:58 -06:00
804a0c8507
Fix weird scrollbar when devtools is in a narrow browser
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 18:56:22 +01:00
7f2ab39609
Merge pull request #3142 from matrix-org/travis/preview-loading
...
Show a loading state for slow peeks
2019-06-27 09:24:25 -06:00
59b4a3398d
Limit reactions row on initial display
...
This limits the reactions row below messages to initially show at most 8 keys.
For those messages with more than that, a "Show all" option appears to reveal
all the keys.
Fixes https://github.com/vector-im/riot-web/issues/9570
2019-06-27 13:17:23 +01:00
e287362a8b
Reaction buttons should use pointer cursor
2019-06-27 11:19:36 +01:00
15d286ed93
Merge pull request #3144 from matrix-org/bwindels/edit-history
...
Edit history dialog
2019-06-26 14:38:53 +00:00
31b2592995
Merge pull request #3143 from MazeChaZer/fix-community-scrollbar
...
Fix the scrollbar in the community bar
2019-06-26 14:34:15 +01:00
92c2a119c9
Remove top margin of community panel container
...
This is a simpler fix for the scrollbar problem than changing the definition
for height, which was my previous attempt at solving this problem.
Additionally, the top and bottom margins are now consistent.
Signed-off-by: Jonas Schürmann <jonasschuermann@aol.de>
2019-06-26 15:27:52 +02:00
8359094847
Merge pull request #3145 from matrix-org/bwindels/edit-focus-border
...
Add focus border to edit composer
2019-06-26 13:16:59 +00:00
8d85967824
Merge pull request #3139 from matrix-org/travis/upgrades-final
...
Fix room upgrade warning being chopped off and a spelling mistake
2019-06-26 07:12:39 -06:00
2e3a6b3c0b
set 50% transparent accent color as editor focus border
2019-06-26 14:40:33 +02:00
d20b765e27
rename $accent-color-50pct to $accent-color-darker
...
we'll use $accent-color-50pct for 50% transparent accent color
2019-06-26 14:34:26 +02:00
498db2597d
show hand on hovering (edited) marker
2019-06-26 12:15:13 +02:00
ddae4de7bd
cleanup: RoomDirectory doesn't use gemini anymore
2019-06-26 11:59:56 +02:00
fffdfde8ba
center dialog title
2019-06-26 11:59:56 +02:00
ee03a0f31d
recycle EventTile css to make history items look mostly similar
2019-06-26 11:59:56 +02:00
8c9a6ddf96
support edits pagination in a ScrollPanel
2019-06-26 11:59:56 +02:00
beb003b2d6
some preliminary styling
2019-06-26 11:59:56 +02:00
c9aa7efe54
don't require EventTile for default timestamp style
2019-06-26 11:59:56 +02:00
ef71e6fd4f
very basic & hackish edit history dialog
2019-06-26 11:59:56 +02:00
2d9fbcab70
Fix the scrollbar in the community bar
...
Currently the scrollbar is always visible because the inner container is 5px
bigger in height than the outer container. This is hereby fixed.
Signed-off-by: Jonas Schürmann <jonasschuermann@aol.de>
2019-06-26 10:49:46 +02:00
ca6ddf324f
Show a loading state for slow peeks
2019-06-25 20:56:33 -06:00
0701d89bbe
Fix upgrade warning being chopped off
...
The flex box was behaving a bit strange, so we just wrap the content and change `height: 235px` to `max-height: 235px` to get scrollbars.
2019-06-25 15:40:22 -06:00
93384f91f5
Show reaction title and shortcode on hover
...
This shows the title and shortcode for the hovered reaction at the bottom of the
tooltip. If nothing is hovered, a blank space is shown for now, but will
eventually become a link to a full emoji picker in future work.
Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 18:15:03 +01:00
c1821fabd3
Remove toggling reaction dimensions
...
This removes the v1 Reactions UX which only allowed you to choose only one emoji
out of each pair. It is replaced by a different UX inside a tooltip and without
these constraints.
Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 16:23:31 +01:00
088bbbfb91
Scale up reaction buttons on hover
2019-06-25 16:23:31 +01:00
c6f2bb4ba7
Arrange buttons in a grid
2019-06-25 16:23:30 +01:00
fd2723585f
Add quick reaction buttons in tooltip
...
This adds the set of quick reactions as buttons in a new tooltip accessed via
the react action in the message action bar.
Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 16:23:13 +01:00
8926992feb
Add react button to action bar
...
This adds a (temporarily non-functional) react button to the action bar.
Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 15:12:30 +01:00
f366f7d2b3
Merge pull request #3131 from matrix-org/jryans/interactive-tooltip
...
Add interactive tooltip style
2019-06-24 15:42:02 +01:00
80d73d8430
Add optional rounded chevron for tooltip
...
We'd like to have a rounded point on the chevron for an extra level of polish.
This implements that look for browsers that support `clip-path`.
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-21 15:10:17 +01:00
3bd247ebaa
Tweak interactive tooltip to match design
...
This tweaks the tooltip to match the color, spacing, etc. seen in the designs.
Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-21 15:10:08 +01:00
32bf4588dd
Center tooltip along top or bottom of target
...
This adjusts the positioning to work more the way we want:
* Tooltip is position on the top or bottom edge of the target depending on where
space is available
* Tooltip and chevron are centered
In addition, more bits borrowed from `ContextualMenu` are not needed, so they
have been removed for simplicity.
Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-21 15:04:19 +01:00
6dcdad028e
Clone ContextualMenu to InteractiveTooltip
...
As part of reactions and editing work, we're adding a new style of tooltip that
allows interacting with the content of the tooltip. `ContextualMenu` is closest
out of the things we have today, but it doesn't position in quite the way we
want and it's already quite complex.
To get started, let's first clone that to a new `InteractiveTooltip`.
Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-21 15:04:19 +01:00
b5598df3f7
Remove redundant extra chevrons from ContextualMenu
...
This removes a seemingly redundant layer of extra chevrons from
`ContextualMenu`. Since both chevrons are the same color, there should be no
visual change.
2019-06-21 11:13:08 +01:00
b16a3c53cd
Merge pull request #3122 from matrix-org/jryans/slim-contextualmenu
...
Remove unused ContextualMenu features
2019-06-19 19:18:37 +01:00
78b0f61efe
Merge pull request #3119 from matrix-org/jryans/rename-tooltip-button
...
Fix casing of TooltipButton
2019-06-19 19:18:15 +01:00
dc9282c539
Remove unused ContextualMenu features
2019-06-19 14:47:15 +01:00
bb4b5d7798
TooltipButton rename step 2 of 2
2019-06-19 11:32:03 +01:00
ab4c5f0152
TooltipButton rename step 1 of 2
2019-06-19 11:30:37 +01:00
4ec7a8ddff
Fix casing of TooltipButton
...
My brain can't deal with two different ways to write "Tooltip", so this
converges the naming to match the rest of the code base. Separate commits will
fix up the file names for case-insensitive file systems.
2019-06-19 11:26:13 +01:00
9591e6b0d3
Merge pull request #3071 from matrix-org/t3chguy/authentication_password_field
...
Switch ugly password boxes to Field or styled input
2019-06-19 09:31:11 +01:00
7b514b0573
Merge pull request #3115 from matrix-org/travis/reduce-scalar-calls
...
Defer scalar API calls until they are needed
2019-06-18 08:17:21 -06:00
f9188bca92
reduced opacity for pending redactions
2019-06-18 13:48:51 +02:00
a5f296457f
Make the Manage Integrations Button defer scalar auth to the manager
...
This moves the responsibility of creating a URL to open from the button (and other components) to the integrations manager dialog itself.
By doing this, we also cut down on scalar API calls because we don't pick up on account information until the user opens the dialog.
2019-06-17 15:29:28 -06:00
fac6dc25f6
Merge pull request #3112 from matrix-org/dbkr/reenable_register_button
...
Re-enable register button
2019-06-17 18:45:39 +01:00
872c1acdea
keep mx_Field stretching
2019-06-17 18:29:03 +02:00
3f6bb0c7ca
Use default cursor for disabled submit button
2019-06-17 16:57:13 +01:00
fbe8d1c89b
Switch DeactivateAccountDialog to Field and cleanups
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-16 10:42:46 +01:00
3563b83762
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/authentication_password_field
2019-06-16 10:31:30 +01:00
e4090d6b2e
Merge pull request #3104 from matrix-org/t3chguy/mx_Field_flex_1
...
Use flex: 1 for mx_Field to replace all the calc(100% - 20px) and more
2019-06-14 09:23:36 +00:00
1090b7d912
Use flex: 1 for mx_Field to replace all the calc(100% - 20px) and more
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-13 23:48:47 +01:00
4fda6c21de
Use overflow on MemberInfo name/mxid so that the back button stays
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-12 21:58:10 +01:00
f981d72083
Merge pull request #3095 from matrix-org/jryans/read-marker-action-bar
...
Raise action bar above read marker
2019-06-12 17:23:36 +01:00
5280d8469b
Add comment
2019-06-12 17:23:11 +01:00
4d8809882f
Raise action bar above read marker
...
Use `z-index` to ensure the action bar appears above over things, like the read
marker.
Fixes https://github.com/vector-im/riot-web/issues/9619
2019-06-12 14:41:49 +01:00
413bff084c
Merge pull request #3087 from matrix-org/jryans/context-menu-clipping
...
Align message context menu to right and vertically where space available
2019-06-12 10:19:47 +01:00
eddac4b188
blur spoilers
2019-06-11 21:08:45 +02:00
aacb942d57
Don't handle identity server failure as fatal, and use the right message
...
Fixes https://github.com/vector-im/riot-web/issues/10002
2019-06-10 19:28:32 -06:00
3126880345
Extend context menu alignment without chevrons
...
For context menus without chevrons, this changes the menu components to still
set default styles that align the menu based on the edges used to specify the
menu's position. This is not intended to change the positioning of any existing
menus.
2019-06-10 16:07:28 +01:00
f238bbb6af
Merge branch 'develop' into jryans/reactions-rm-highlight
2019-06-07 13:20:45 -06:00
3320fd9929
Remove highlight from reactions
...
This explicitly sets `color` for the reactions row to ensure it's always the fg
colour, even if the event is highlighted.
Fixes https://github.com/vector-im/riot-web/issues/9697
2019-06-07 15:57:34 +01:00
41cbfe0d27
Merge pull request #3078 from uhoreg/truncate_displayname
...
truncate long display names in timeline headings
2019-06-07 10:24:17 -04:00
795a273e26
Merge pull request #3067 from matrix-org/travis/fail-fast-but-not-too-fast
...
Fail more softly on homeserver liveliness errors
2019-06-07 07:43:45 -06:00
4ab491f823
truncate long display names in timeline headings
...
partial fix for vector-im/riot-web#5739
2019-06-06 22:41:10 -04:00
6881b47939
fix layout on password field
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-06 23:51:04 +01:00
4b18bb17fe
Show read receipts on top of message
...
This allows you to view a long expanded set of read receipts even while hovering
a message.
Fixes https://github.com/vector-im/riot-web/issues/7608
2019-06-06 14:02:35 +01:00
bd0e676b46
Switch ugly password boxes to Field or styled input
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-06 09:16:28 +01:00
ace1bde238
Implement design and copy for errors
2019-06-05 11:32:02 -06:00
635b1ff612
Merge pull request #2928 from Half-Shot/hs/custom-notif-sounds
...
Custom notification sounds for rooms
2019-06-03 14:31:38 -06:00
f9d40940e8
upgrade to twemoji 12.0.4
2019-06-02 06:09:03 +01:00
e8d8eee67b
fix ligatures fully
2019-06-02 05:36:59 +01:00
1abd3db40c
add extra ligatures
2019-06-02 04:46:00 +01:00
caa950f625
add SBIX fallback twemoji font
2019-06-02 04:24:36 +01:00
1c41629376
Merge pull request #3043 from matrix-org/travis/check-login-for-config
...
Accept JSX into the GenericErrorPage and expose local session vars
2019-05-31 11:03:41 -06:00
9369e964fa
Merge remote-tracking branch 'upstream/develop' into hs/custom-notif-sounds
2019-05-31 10:44:30 +01:00
2be00ee0e0
Native emoji require extra line-height
...
Increase line-height so that native emoji aren't cut off when we fall back to
them.
Fixes https://github.com/vector-im/riot-web/issues/9898
2019-05-30 10:26:12 +01:00
5c85f4609e
Accept JSX into the GenericErrorPage and expose local session vars
2019-05-29 12:09:04 -06:00
14dc4b47fa
Merge branch 'develop' into travis/feature/wellknown2
2019-05-22 23:05:54 -06:00
d8f4512439
add basic spoiler support
2019-05-22 20:41:27 +02:00
e01a6ce24c
Add Segoe UI Emoji as native fallback for Windows
2019-05-22 16:27:03 +01:00
ee86471691
remove SBIX font and fallback to native emoji
2019-05-22 13:06:04 +02:00
3d9e631d18
no space in !important
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-05-22 09:35:09 +00:00
1bdcb0c35a
remove obsolete comments
2019-05-22 11:19:35 +02:00
1345db5f98
remove fira font
2019-05-22 11:16:29 +02:00
0024a88daf
Inconsolata
2019-05-22 03:05:57 +01:00
4ae652e5c3
load twemoji dynamically as colr or sbix; fix monospace
2019-05-22 02:31:24 +01:00
907c7ed119
Merge pull request #2994 from matrix-org/travis/screenreader/topleftmenu
...
Update TopLeftMenu for accessibility: Keyboard shortcut, reduced screen reader noise
2019-05-21 09:52:26 -06:00
ef4fe52d6b
Merge pull request #3002 from matrix-org/bwindels/pill-avatar-fixup
...
Fixup: also change editor margin when last event and buttons are not overlaying
2019-05-21 14:33:39 +00:00
30d374dff4
also changing margin when last event and buttons are not overlaying
2019-05-21 16:06:14 +02:00
2d4d608ed6
Merge pull request #2997 from matrix-org/bwindels/pill-avatars
...
Message editing: render avatars for pills in the editor
2019-05-21 12:11:06 +00:00
e48e72c162
pr feedback
2019-05-21 13:50:27 +02:00
7c03d71607
give continued events a little bit of top padding
...
this way, the background isn't clipped at the top
2019-05-21 12:20:58 +02:00
5d184b3f77
reuse mx_Pill styles for editor pills to avoid style duplication
...
the avatar style code is still different though,
as it's implemented differently
This also prevents updating the css variables when not needed,
which caused the avatar to flicker when updating the editor.
2019-05-21 12:19:35 +02:00
b00a38a1e5
apply mx_EventTile_content to editor, so it gets the same right margin
...
this way we don't have to include it in the magic number
2019-05-21 12:18:20 +02:00
52b0f285c6
Add some clarifying comments
2019-05-20 21:07:12 -06:00
3476be3327
Merge branch 'develop' into travis/feature/wellknown2
2019-05-20 19:50:02 -06:00
d3f06763b3
Merge branch 'develop' into matthew/twemoji
2019-05-20 16:38:44 +01:00
2bacabc002
apply 34px margin the mx_EventTile_content also has
...
so width of editor stay the same as content
(unrelated to pills, really)
2019-05-20 16:01:31 +02:00
5d80c3a2a4
fallback to avatar bg color
2019-05-20 15:39:06 +02:00
David Baker