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

921 commits

Author SHA1 Message Date
Travis Ralston
266e3af475 Appease the scss linter 2019-08-23 09:20:28 -06:00
Travis Ralston
b3cda4b19a Support multiple integration managers behind a labs flag 
Fixes https://github.com/vector-im/riot-web/issues/10622
Implements [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957)

Design is not final.
 2019-08-23 09:12:40 -06:00
Bruno Windels
f39dc6feab
Merge pull request #3287 from matrix-org/bwindels/new-main-composer 
Support editing composer to be used as main composer (feature flagged)
 2019-08-23 10:06:19 +00:00
Bruno Windels
4a27abb131 fix css lint 2019-08-22 15:11:31 +01:00
Bruno Windels
71286b5610 restore reply_to_event action 2019-08-22 13:33:20 +01:00
Bruno Windels
d4ca087abe fix styling issues 
- grow/shrink between min and max height correctly
 - don't grow wider than available space
 - some space between editor and buttons
 2019-08-22 13:33:20 +01:00
Bruno Windels
33c6945fc4 align autocomplete at top of composer 2019-08-22 13:33:20 +01:00
Bruno Windels
64e83a8111 font-size 2019-08-22 13:33:20 +01:00
Bruno Windels
f9992a1fc6 implement editor placeholder 2019-08-22 13:33:20 +01:00
Bruno Windels
cfbd2e9cc8 support basic sending with new main composer 
this removes all formatting options, as the new editor doesn't
have any.
 2019-08-22 13:33:20 +01:00
Bruno Windels
92d7263046 move editor padding to edit specific style file 
as it will be different for the main composer
 2019-08-22 13:33:20 +01:00
Bruno Windels
505846ce53 split up css, update class names 2019-08-22 13:33:20 +01:00
Travis Ralston
6449016d4b Fix alignment of discovery section addresses 
We target the addresses specifically to avoid crushing the subsection text.
 2019-08-21 14:41:25 -06:00
Travis Ralston
04bb2ed322
Merge pull request #3327 from matrix-org/travis/discover-terms 
Handle terms agreement in Discovery section of user settings
 2019-08-21 10:14:45 -06:00
Travis Ralston
f55a40001c Touch up settings: alignment, spacing, error states 
Fixes https://github.com/vector-im/riot-web/issues/10554

Issues fixed:
* Fields were not ~30px from the avatar (too much right margin)
* Tooltips overflowed the dialog on some resolutions
* SetIdServer didn't have an error state for making the field red
* Spacing between sections in Discovery was wrong (fixed by just removing the problematic n+2 selector - it didn't help anything)
 2019-08-20 13:20:07 -06:00
David Baker
f5da870040
Merge pull request #3326 from matrix-org/dbkr/device_name_public 
Clarify that device names are publicly visible
 2019-08-20 09:29:45 +01:00
Travis Ralston
3181829532 Use new InlineTermsAgreement component on IS Discovery section 
Fixes https://github.com/vector-im/riot-web/issues/10522
 2019-08-19 23:00:05 -06:00
Travis Ralston
417de0cac7 Add an inline terms agreement component 
Handles agreement of terms in an inline way.
 2019-08-19 22:59:33 -06:00
David Baker
f7083ac332 Clarify that device names are publicly visible 
And also a bunch of other UI fixes in the devices table:
 * It's the devices table, don't need 'device' in all the headers
 * Not really necessary to label checkboxes with 'select'
 * Stop table from moving down when the delete button appears

Fixes https://github.com/vector-im/riot-web/issues/10216
 2019-08-19 18:09:37 +01:00
J. Ryan Stinnett
8a7b43fd1a Tweak Settings padding / margin slightly 
This makes a few small tweaks to Settings padding and margin, but more is still
needed. I am told that https://github.com/vector-im/riot-web/issues/10554 will
soon take a holistic view on the problem, so this is a more conservation
temporary change.
 2019-08-19 15:45:04 +01:00
J. Ryan Stinnett
7cc27beb44 Remove custom font size for IM URL 
As best as I can tell, the designs call for the IM URL to be the same size as
other subheadings. The font size in Zeplin doesn't match what is currently used
in Settings, so this likely caused confusion.
 2019-08-19 14:34:22 +01:00
Travis Ralston
02a4121401 Mixin for field width 2019-08-14 08:55:49 -06:00
Travis Ralston
beb6ec4327 Merge branch 'develop' into travis/integs/account_set 2019-08-14 08:45:01 -06:00
Travis Ralston
d4bbed31d5 Merge branch 'develop' into travis/integs/account_set 2019-08-13 09:03:50 -06:00
David Baker
050766e7bb selector ordering 2019-08-13 15:19:39 +01:00
David Baker
e07c22a78d Make mixin for fields in settings that need to be the same width 
and make that width narrower so we can fit a tooltip in the left
hand side (they were a little too wide anyway for the kind of data
being entered, even on a narrow window).
 2019-08-13 12:53:14 +01:00
David Baker
c732ae3aa9
Correct license header 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-08-13 10:46:42 +01:00
Travis Ralston
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
Travis Ralston
438eba1c46 Fix alignment of add email/phone number inputs in settings 2019-08-12 14:14:17 -06:00
David Baker
bf9caa7fd8 add the rest of the files 2019-08-12 11:51:44 +01:00
David Baker
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
Travis Ralston
610baff09a
Merge pull request #2668 from azuenko/develop 
Fix waste of space of collapsed left panel
 2019-08-06 13:54:04 -06:00
Michael Telatynski
f6dbeef204
Merge pull request #3257 from matrix-org/t3chguy/slashcommands_help 
Add help slash command
 2019-08-06 18:50:49 +01:00
Michael Telatynski
1e8b304b3c Remove /tint completely and dedup copyright 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 18:08:17 +01:00
Michael Telatynski
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
J. Ryan Stinnett
aa0a2a579e Add copyright headers 2019-08-06 12:43:30 +01:00
Anton Zuenko
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
J. Ryan Stinnett
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
Bruno Windels
c093b6ed9c strikethrough & underline deletions & insertions 2019-07-31 14:44:48 +02:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
Bruno Windels
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
Bruno Windels
3753e5261d Implement diffing html messages in the edit history 2019-07-24 11:28:56 +02:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
David Baker
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
Bruno Windels
f305d8ac08 Basic diff visualisation for plain text edits 2019-07-19 16:09:23 +02:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
ca1e5bb3ae Comment disabled rules 2019-07-11 09:30:01 +01:00
J. Ryan Stinnett
38d6953bf6 Manually fix remaining stylelint issues 2019-07-10 16:56:40 +01:00
J. Ryan Stinnett
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
David Baker
54aaabac74 Initial support for ToS dialogs for IS/IM 
as per MSC2140
 2019-07-09 18:51:56 +01:00
Travis Ralston
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
Bruno Windels
7a482461dd
Merge pull request #3180 from matrix-org/bwindels/history-actions 
Edit history actions
 2019-07-08 08:19:27 +00:00
J. Ryan Stinnett
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
Travis Ralston
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
Bruno Windels
375976575b add redact button 2019-07-04 11:07:22 +02:00
Bruno Windels
344cc079c5 show /relations error in edit history dialog 2019-07-03 12:16:58 +02:00
Bruno Windels
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
J. Ryan Stinnett
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
Bruno Windels
fc3c4fccc2 set background on highlighted messages 2019-07-02 18:31:11 +02:00
J. Ryan Stinnett
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
Bruno Windels
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
Michael Telatynski
49b89217a3 MemberInfo wrap Device Name/ID 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-30 19:21:19 +01:00
J. Ryan Stinnett
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
Michael Telatynski
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
Travis Ralston
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
J. Ryan Stinnett
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
J. Ryan Stinnett
e287362a8b Reaction buttons should use pointer cursor 2019-06-27 11:19:36 +01:00
Bruno Windels
15d286ed93
Merge pull request #3144 from matrix-org/bwindels/edit-history 
Edit history dialog
 2019-06-26 14:38:53 +00:00
Bruno Windels
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
Travis Ralston
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
Bruno Windels
2e3a6b3c0b set 50% transparent accent color as editor focus border 2019-06-26 14:40:33 +02:00
Bruno Windels
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
Bruno Windels
498db2597d show hand on hovering (edited) marker 2019-06-26 12:15:13 +02:00
Bruno Windels
fffdfde8ba center dialog title 2019-06-26 11:59:56 +02:00
Bruno Windels
ee03a0f31d recycle EventTile css to make history items look mostly similar 2019-06-26 11:59:56 +02:00
Bruno Windels
8c9a6ddf96 support edits pagination in a ScrollPanel 2019-06-26 11:59:56 +02:00
Bruno Windels
beb003b2d6 some preliminary styling 2019-06-26 11:59:56 +02:00
Bruno Windels
c9aa7efe54 don't require EventTile for default timestamp style 2019-06-26 11:59:56 +02:00
Bruno Windels
ef71e6fd4f very basic & hackish edit history dialog 2019-06-26 11:59:56 +02:00
Travis Ralston
ca6ddf324f Show a loading state for slow peeks 2019-06-25 20:56:33 -06:00
Travis Ralston
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
088bbbfb91 Scale up reaction buttons on hover 2019-06-25 16:23:31 +01:00
J. Ryan Stinnett
c6f2bb4ba7 Arrange buttons in a grid 2019-06-25 16:23:30 +01:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
78b0f61efe
Merge pull request #3119 from matrix-org/jryans/rename-tooltip-button 
Fix casing of TooltipButton
 2019-06-19 19:18:15 +01:00
J. Ryan Stinnett
bb4b5d7798 TooltipButton rename step 2 of 2 2019-06-19 11:32:03 +01:00
J. Ryan Stinnett
ab4c5f0152 TooltipButton rename step 1 of 2 2019-06-19 11:30:37 +01:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
Travis Ralston
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
Bruno Windels
f9188bca92 reduced opacity for pending redactions 2019-06-18 13:48:51 +02:00
Travis Ralston
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
Bruno Windels
872c1acdea keep mx_Field stretching 2019-06-17 18:29:03 +02:00
Michael Telatynski
fbe8d1c89b Switch DeactivateAccountDialog to Field and cleanups 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-16 10:42:46 +01:00
Michael Telatynski
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
Bruno Windels
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
Michael Telatynski
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
Michael Telatynski
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
J. Ryan Stinnett
5280d8469b Add comment 2019-06-12 17:23:11 +01:00
J. Ryan Stinnett
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
Sorunome
eddac4b188
blur spoilers 2019-06-11 21:08:45 +02:00
Travis Ralston
f238bbb6af Merge branch 'develop' into jryans/reactions-rm-highlight 2019-06-07 13:20:45 -06:00
J. Ryan Stinnett
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
Hubert Chathi
4ab491f823 truncate long display names in timeline headings 
partial fix for vector-im/riot-web#5739
 2019-06-06 22:41:10 -04:00
Michael Telatynski
6881b47939 fix layout on password field 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-06 23:51:04 +01:00
J. Ryan Stinnett
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
Michael Telatynski
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
Will Hunt
9369e964fa Merge remote-tracking branch 'upstream/develop' into hs/custom-notif-sounds 2019-05-31 10:44:30 +01:00
J. Ryan Stinnett
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
Travis Ralston
14dc4b47fa Merge branch 'develop' into travis/feature/wellknown2 2019-05-22 23:05:54 -06:00
Sorunome
d8f4512439
add basic spoiler support 2019-05-22 20:41:27 +02:00
Bruno Windels
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
Bruno Windels
30d374dff4 also changing margin when last event and buttons are not overlaying 2019-05-21 16:06:14 +02:00
Bruno Windels
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
Bruno Windels
e48e72c162 pr feedback 2019-05-21 13:50:27 +02:00
Bruno Windels
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
Bruno Windels
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
Bruno Windels
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
Travis Ralston
3476be3327 Merge branch 'develop' into travis/feature/wellknown2 2019-05-20 19:50:02 -06:00
Matthew Hodgson
d3f06763b3
Merge branch 'develop' into matthew/twemoji 2019-05-20 16:38:44 +01:00
Bruno Windels
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
Bruno Windels
5d80c3a2a4 fallback to avatar bg color 2019-05-20 15:39:06 +02:00
Bruno Windels
01ef1dd20e style room pills correctly 2019-05-20 15:38:59 +02:00
Bruno Windels
c1b2f3dce1 make user pill avatars work in editor 2019-05-20 14:21:25 +02:00
Bruno Windels
1368a5eb80
Merge pull request #2996 from matrix-org/bwindels/composerdesign 
Message editing: apply design
 2019-05-20 08:42:41 +00:00
Bruno Windels
a47e722fa1 same height as normal pill 2019-05-20 10:28:26 +02:00
Bruno Windels
3b598a1782 set pill avatar through css variables to set on psuedo-element 
this way it won't interfere with editor selection/caret
 2019-05-20 10:28:26 +02:00
Matthew Hodgson
e48cc44cba apply monospace font correctly 2019-05-19 17:41:18 +01:00
Matthew Hodgson
069a5a9546 remove obsolete emojione css 2019-05-19 17:11:41 +01:00
Matthew Hodgson
24b03374ac moar lineheight needed for big twemoji 2019-05-19 16:48:29 +01:00
J. Ryan Stinnett
3a405701a3 Debug: Show all events 2019-05-17 16:34:01 +01:00
Bruno Windels
d81ab2464b better button alignment 
also fix sticking out at the right side when not overlaying
 2019-05-17 16:15:06 +01:00
Bruno Windels
8ce8ca18ff theme-ify! 2019-05-17 16:10:21 +01:00
Bruno Windels
aef9323f21 explain negative margin 2019-05-17 16:10:11 +01:00
Bruno Windels
f9462d1012 hide timestamp while editing 2019-05-17 16:01:52 +01:00
Bruno Windels
aeea4ee83a a bit more horizontal padding for the editor 2019-05-17 16:00:58 +01:00
Bruno Windels
cf8189ed43 align buttons perfectly with editor edge 2019-05-17 16:00:39 +01:00
Bruno Windels
81245e9c05 cull editor height to 200px 2019-05-17 16:00:22 +01:00
Bruno Windels
2544decab2 fix chrome not right aligning buttons 2019-05-17 16:00:08 +01:00
Bruno Windels
ddefeae136 update design of editor to look as close to original tile (and design) 
the buttons below the composer are overlayed onto the previous event.
In case of the last event, for now we make them not overflow, but make the
tile grow. The design says it should overlay on the main composer for the last
event tile, postponing that for a bit though as not sure what is the best way
to do that.
 2019-05-17 15:33:11 +01:00
J. Ryan Stinnett
43c9e6d942 Reactions / editing tooltip tweaks 2019-05-17 15:10:35 +01:00
J. Ryan Stinnett
603e6b7055 Adjust edited tooltip to use shared styles 2019-05-17 12:19:02 +01:00
J. Ryan Stinnett
059988ff5c Extract tooltip styling to a shared class 
We want to use the same styling with edited tooltip as well, so this extracts
the shared bits.
 2019-05-17 12:11:01 +01:00
J. Ryan Stinnett
3da1f73ea4 Add a basic tooltip showing who reacted 
This adds a first attempt at tooltip showing who reacted to a message. It
doesn't limit senders or position the tooltip nicely, but the info is there at
least.

Part of https://github.com/vector-im/riot-web/issues/9722
 2019-05-17 12:11:01 +01:00
Bruno Windels
4a6725d4c2 Message editing: show (edited) marker on edited messages, with tooltip 2019-05-17 11:36:36 +01:00
Michael Telatynski
d7c6869188 Apply Flex voodoo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-16 21:55:17 +01:00
Travis Ralston
0c7aa39273 Merge branch 'develop' into travis/feature/wellknown2 2019-05-16 12:59:50 -06:00
Travis Ralston
60a13652df
Merge pull request #2965 from matrix-org/travis/wk/tooltip 
Render underlines and tooltips on custom server names in auth pages
 2019-05-15 14:13:44 -06:00
Will Hunt
2994d99378
Merge branch 'develop' into hs/custom-notif-sounds 2019-05-15 16:09:55 +01:00
Will Hunt
d752de0972 Improve UX 2019-05-15 15:52:42 +01:00
Bruno Windels
edc100163f
Merge pull request #2952 from matrix-org/bwindels/message-edit-editor 
Initial support for editing messages
 2019-05-15 09:23:01 +00:00
Bruno Windels
22533ba2d4 use theme var for bg color 2019-05-15 10:12:16 +01:00
Bruno Windels
d83e278f6b PR feedback, cleanup 2019-05-15 09:46:08 +01:00
Michael Telatynski
9b40913838
Merge pull request #2957 from matrix-org/t3chguy/invite_perms 
Check permission to invite before showing invite buttons/disable them
 2019-05-14 23:15:59 +01:00
Michael Telatynski
fd07b5c476 use scss variable for grey 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-14 23:03:02 +01:00
Will Hunt
277c4ab809
Merge branch 'develop' into hs/custom-notif-sounds 2019-05-14 21:07:03 +01:00
Will Hunt
626cb46915 Cleanup interface buttons 2019-05-14 21:05:22 +01:00
Travis Ralston
4c1ac38dd4 Merge branch 'develop' into travis/feature/wellknown2 2019-05-14 10:53:01 -06:00
J. Ryan Stinnett
a2e0dc2f7e Tweak message action bar position 
This moves the message action bar up slightly to avoid covering message text.
 2019-05-14 16:52:02 +01:00
Bruno Windels
759a4a54ef send the actual m.replace event from composer content 2019-05-14 15:38:16 +01:00
Bruno Windels
c98e716cbd some pill styling 2019-05-14 15:38:16 +01:00
Bruno Windels
4ff37ca046 don't show model for now 2019-05-14 15:38:16 +01:00
Bruno Windels
fc87a27c5d make editor nicer 2019-05-14 15:38:16 +01:00
Bruno Windels
317e88bef2 initial hacky hookup of Autocomplete menu in MessageEditor 2019-05-14 15:38:16 +01:00
Bruno Windels
ebdb9fcb9c don't collapse whitespace in editor 2019-05-14 15:38:16 +01:00
Bruno Windels
76bb56a2bf initial hookup editor code with react component 2019-05-14 15:38:16 +01:00
Bruno Windels
6599d605cd wire up editor component (somewhat hacky) 2019-05-14 15:38:16 +01:00
Travis Ralston
e4576dac28 Render underlines and tooltips on custom server names in auth pages 
See https://github.com/vector-im/riot-web/issues/9290
 2019-05-13 17:16:40 -06:00
Travis Ralston
83737654ff Merge branch 'develop' into travis/feature/wellknown2 2019-05-13 09:20:10 -06:00
J. Ryan Stinnett
f5aa32bc96
Merge pull request #2954 from matrix-org/jryans/aggregations 
Send and undo reaction events
 2019-05-13 15:20:28 +01:00
Michael Telatynski
3cd9c152c2 Check permission to invite before showing invite buttons/disable them 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-11 19:45:24 +01:00
Travis Ralston
6a941aca91
Merge pull request #2941 from matrix-org/travis/guests/block-ui 
Use validated server config for login, registration, and password reset
 2019-05-10 11:21:21 -06:00
J. Ryan Stinnett
6a3708d51b Disable select for reaction buttons 2019-05-10 18:09:32 +01:00
Michael Telatynski
cd5a460b2b Iterate PR based on feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-09 22:30:45 +01:00
Michael Telatynski
16c027dc61 Merge branches 'develop' and 'devtools_serverlist' of github.com:matrix-org/matrix-react-sdk into devtools_serverlist 2019-05-09 22:27:37 +01:00
J. Ryan Stinnett
576241236c Extract ReactionDimension out of MessageActionBar 
The reactions bits were cluttering up `MessageActionBar` so they have now been
extracted to a separate component.
 2019-05-08 13:53:41 +01:00
Travis Ralston
636cb8a5cc Have ServerConfig and co. do validation of the config in-house 
This also causes the components to produce a ValidatedServerConfig for use by other components.
 2019-05-03 11:32:59 -06:00
J. Ryan Stinnett
87f737b8a3 Increment an existing reaction 
This allows you to increment an existing reaction below a message by clicking on
it.

At the moment, this is not linked to the action bar, so they each are using
local state. We'll likely want to add some mechanism so that we can local echo
to both of these UI areas at the same time, but that can be done separately.

Fixes https://github.com/vector-im/riot-web/issues/9486
 2019-05-02 12:05:17 +01:00
J. Ryan Stinnett
15c5893278 Display existing reactions below the message 
This displays the existing reactions a message has from all users below the
message.

Since we don't currently have an API to actually get these events yet,
adds a temporary hook that looks for a specific message to inject some sample
data. This helps build out the UI for now and can be removed once it exists.

Fixes https://github.com/vector-im/riot-web/issues/9573
 2019-05-02 12:05:17 +01:00
J. Ryan Stinnett
784599d9e9 Add primary reactions to action bar 
This adds the primary reactions to the action bar. They act as toggles where you
can only select one from each group at a time.

Note that currently we aren't actually sending the reaction at all. That's left
for a separate task.

Fixes https://github.com/vector-im/riot-web/issues/9576
 2019-04-30 18:09:10 +01:00
J. Ryan Stinnett
4b50d2a2bf Update action bar colors for dark theme 
In addition, this also adjusts the event hover colors to match the palette.

Fixes https://github.com/vector-im/riot-web/issues/9591
 2019-04-30 17:42:17 +01:00
J. Ryan Stinnett
739c8c0314 Promote reply button up to message action bar 
This moves the reply action out of the existing options menu and up to the
message action bar for easier access.
 2019-04-29 15:53:03 +01:00
J. Ryan Stinnett
8ef9fe951d Update styling of message action bar for multiple buttons 
This applies the new design for multiple buttons in the message action bar,
paving the way for more things to appear here.

In addition, this changes the existing options button to use the three vertical
dots icon. Some theme colors are also tweaked to align with what they were meant
to be from the unified palette.
 2019-04-29 15:20:51 +01:00
J. Ryan Stinnett
ed8bbc7082 Extract message options button to action bar 
This adds a new action bar component to hold multiple per-message actions. This
existing options button has moved to this new component, and is currently the
only action.
 2019-04-29 15:20:50 +01:00
J. Ryan Stinnett
530c92e03d Rename event edit button to options button 
This naming is clearer as it doesn't really edit at all (it shows a context
menu). This should also be less confusing with actual editing when it arrives.
 2019-04-29 15:20:50 +01:00
J. Ryan Stinnett
26f732723e Animate tooltips when hiding as well as showing 
This uses the same animation style as on show, but twice as fast.
 2019-04-25 14:29:10 +01:00