OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
17,254 Commits
215 Branches
561 Tags
470 MiB
Commit Graph

748 Commits (3c4c595f7989a644f03502677ea02db090addb2d)

Author SHA1 Message Date
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
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
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