Commit Graph

1315 Commits (d02185e4af661542e39a568d43aa58f19670ec0c)

Author SHA1 Message Date
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 52b0f285c6 Add some clarifying comments 2019-05-20 21:07:12 -06: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
Matthew Hodgson 7b2602f1c7 apply monospace to pre 2019-05-20 10:09:19 +01: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 dbc6815abf make EmojiProvider and stripped-emoji.json work 2019-05-19 20:48:18 +01: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
Matthew Hodgson dc72641264 replace emojione with twemoji. completely untested & debugged & unoptimised 2019-05-19 15:23:43 +01:00
Travis Ralston 47add75278 Add class to hide focus highlight
We use tabIndex to make elements selectable and therefore focused by screen readers. Doing this draws a blue border (in chrome at least) around the element - in some cases, we don't want this.
2019-05-17 15:25:17 -06: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
Bruno Windels 52c4d7b6b0 fixup edit icon 2019-05-15 15:53:02 +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 6b932d58e6 remove cruft from edit icon 2019-05-15 10:10:29 +01:00
Bruno Windels d83e278f6b PR feedback, cleanup 2019-05-15 09:46:08 +01:00
J. Ryan Stinnett 1421e8e06b Tweak reply arrow and hover color 2019-05-15 09:12:53 +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
J. Ryan Stinnett 0b42ded007 Style complexity progress bars more heavily
This disables the native progress appearance and uses the green color from our
themes.
2019-04-25 14:29:10 +01:00
J. Ryan Stinnett 67d7091dcd Password score progress should be full width in tooltip 2019-04-25 14:29:10 +01:00
J. Ryan Stinnett a7c37733b8 Rebalance margins in validation tooltip 2019-04-25 14:29:09 +01:00
J. Ryan Stinnett 37e09b5569 Add check and x icons for validation feedback
Adds icons from the Feather set with the same color as text. Tweaks validation
item spacing to match the design.
2019-04-25 14:29:09 +01:00
J. Ryan Stinnett 338d83ab55 Add validation feedback helper
This adds a general validation feedback mechanism for checking input values. An
initial example is wired up for the username input on registration.
2019-04-25 14:29:09 +01:00
Luca Weiss 12f92c49a6
Mark a few CSS classes as not selectable
Should be enough to make copy-pasting not a nightmare.

For vector-im/riot-web#7460

Also remove an instance where the vendor prefixes were used, but a build
step adds those automatically

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
2019-04-23 19:52:48 +02:00
Bruno Windels faecceb3b4 remove manual order so component order follows markup order 2019-04-18 09:20:26 +02:00
Bruno Windels 22874f62ab Merge branch 'develop' into bwindels/stylepreviewbar 2019-04-17 11:06:21 +02:00
Bruno Windels 1100320351 make non-member inviter name also bold 2019-04-17 11:02:58 +02:00
Bruno Windels 86620839ae make username clickable 2019-04-17 10:57:45 +02:00
Bruno Windels 8a371080d7 colored inviter name and layout 2019-04-17 10:22:35 +02:00
Bruno Windels eeaa7143ac move name coloring out of sender profile
so we can reuse it in room preview bar
2019-04-17 10:21:30 +02:00
Bruno Windels e40757a801 make sure long subtitles dont overflow 2019-04-16 16:19:50 +02:00
Bruno Windels c1ff5f2fba implement style 2019-04-15 17:11:26 +02:00
J. Ryan Stinnett 32f28a7184
Merge pull request #2918 from jryans/bold-for-all
Ensure `<b>` tags appear bold for all browsers
2019-04-15 09:55:09 +01:00
Travis Ralston e8d141fc3c
Merge pull request #2908 from matrix-org/travis/upgrades/linkback
Add a link in room settings to get at the tombstoned room if it exists
2019-04-12 10:21:39 -06:00
J. Ryan Stinnett 11bd82ee4c Ensure <b> tags appear bold for all browsers
In Firefox, the default <b> style is such that it doesn't appear bold with our
current selection of specific font weights. This specifically sets a working
font weight.
2019-04-12 15:09:32 +01:00
Bruno Windels 01e9de9a3a differentiate style based on preview or not 2019-04-12 12:54:13 +02:00
Travis Ralston aadc1a8d75 Add a generic error page element for startup errors
Used by Riot to communicate configuration problems.
2019-04-11 15:52:37 -06:00
Bruno Windels 0553a6f1d6 some style changes 2019-04-11 13:07:54 +02:00
Travis Ralston 15e8ce7a7f Add a link in room settings to get at the tombstoned room if it exists
Fixes https://github.com/vector-im/riot-web/issues/8542
2019-04-10 15:00:02 -06:00
J. Ryan Stinnett 12f7d1715b Remove BottomLeftMenu and supporting bits
The `BottomLeftMenu` component is not used in the new design. This removes the
component and also any images and sub-components that were only used by it.
2019-04-09 17:38:32 +01:00
David Baker 04b69116ee Fix tedious CSS stuff with stylelint --fix 2019-04-09 15:05:39 +01:00
David Baker eb6f3f6008 Fix up some CSS things stylelint was complaining about
And also disable a load of rules that feel like they're probably
causing more headaches than they fix.
2019-04-09 15:03:13 +01:00
David Baker acdcf6639e Put width / height first in css 2019-04-08 19:11:04 +01:00
David Baker 670f6e4f99 Simplify settings dialog CSS
Stop the settings dialogs from requiring special styles on the
mx_Dialog which required passing in a classname from anywhere the
settings dialogs were opened (although this still requires
static=true). Some of the things have now been adopted for all dialogs
(border-radius), others have been moved to within the dialog content.
2019-04-08 16:48:42 +01:00
David Baker 7b5658e3b1 Fix CSS silliness
Meant to replace the existing block rather than add another one
with the same name! Also meant vw rather than width.
2019-04-08 14:21:12 +01:00
David Baker 833b46d040 Move SettingsDialog width override to fixedWidth
Move the width overrides to the container so it's the same thing
dictating its size as the rest of the dialogs
2019-04-08 14:17:18 +01:00
David Baker 3fdf822d46 Fix fixed width dialogs
Move the max-width to the fixedWidth div rather than the dialog,
otherwise the fixedWidth keeps getting bigger with bigger windows
but the dialog doesn't so it scrolls.
2019-04-08 13:37:29 +01:00
David Baker c87c4ef5a4 Fix settings dialog layout
The close 'x' was ending up off the right hand side which made
everything else overlap with the left panel, depending on how wide
your window was.

This isn't the end of the dialog problems but it will at least stop
settings from being mangled on develop.
2019-04-08 11:56:08 +01:00
David Baker 3fe6d51fbe
Merge pull request #2868 from matrix-org/dbkr/dialog_redesign
Design tweaks to dialogs
2019-04-08 09:33:34 +01:00
Travis Ralston 223498a979
Merge pull request #2874 from matrix-org/travis/breadcrumbs/dms
Add an indicator to show a room is a direct chat in breadcrumbs
2019-04-05 08:15:12 -06:00
J. Ryan Stinnett 590535c569
Use value from unified palette
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
2019-04-05 10:06:35 +01:00
Travis Ralston b7e557e49a Autohide the scrollbar on breadcrumbs
Fixes https://github.com/vector-im/riot-web/issues/9349
2019-04-04 16:27:00 -06:00
Travis Ralston 095e6a3ba6 Add an indicator to show a room is a direct chat
Fixes https://github.com/vector-im/riot-web/issues/8797
2019-04-04 14:31:23 -06:00
Travis Ralston 9618187d2e
Merge pull request #2855 from YaoiFangirl420/rotate_images
Add option to rotate images
2019-04-04 09:46:06 -06:00
YaoiFangirl420 9bd1ba60f5 Add option to rotate images
cf. https://github.com/vector-im/riot-web/issues/9257

Add rotate clockwise/counterclockwise buttons to <ImageView>

Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-04 01:48:41 -07:00
Travis Ralston f5600fd4d7 Add badges to breadcrumb rooms
Fixes https://github.com/vector-im/riot-web/issues/8606
2019-04-03 15:29:15 -06:00
David Baker 0a61d05ba2 Make fixed width dialogs actually fixed width again
Settings overrode that to be larger, so do the corresponding
override for the other part.
2019-04-03 17:53:38 +01:00
David Baker c0867e8e48 Fix dialog title colour on dark theme 2019-04-03 16:48:11 +01:00
David Baker 7925e7169a Design tweaks to dialogs
Little bit of a mix of things in this one:
 * Support variable-width dialogs. Default is fixed-width as before,
   only UploadConformDialog is variable-width. Controlled by a prop
   to BaseDialog.
 * Fixes to the cancel 'x' - scale the mask image, tweak size & colour
 * Colour & boldness of dialog titles
 * Align the dialog title & cancel 'x'
 * Remove gap between dialog buttons & right hand side of dialog(!)
 * Round corners on dialogs
 * Add grey border on image preview in upload confirm dialog
 * and, squeezing in slightly randomly, finish the partially renamed
   ChatInviteDialog to AddressPickerDialog.
2019-04-03 16:27:45 +01:00
Travis Ralston c3d3dd1fd7
Merge pull request #2860 from matrix-org/travis/breadcrumbs/parted
Apply 50% opacity to left breadcrumbs
2019-04-03 08:42:39 -06:00
David Baker 24ccfa69f4
Merge pull request #2858 from matrix-org/dbkr/upload_redesign
Implement redesigned upload confirmation screens
2019-04-02 11:00:16 +01:00
Travis Ralston 7e2291592c Apply 50% opacity to left breadcrumbs
Fixes https://github.com/vector-im/riot-web/issues/8564

We listen for membership changes to make sure the state is kept up to date.
2019-04-01 11:59:39 -06:00
J. Ryan Stinnett 3948520eaa Use Field component in bug report dialog
This uses the field component in the bug report dialog, which generally improves
the styling to fit in more naturally with the rest of the app so that it feels
more trustworthy.

Fixes https://github.com/vector-im/riot-web/issues/9343
2019-04-01 17:50:12 +01:00
David Baker 5b2cee2fc1 Implement redesigned upload confirmation screens
Also fairly significant refactor of the uploading code: there are
a number of different ways of triggerring a file upload and each
went through a different code path (the media config size limit
worked on one of those paths). Basically take a lot of code out
of the views and put it into ContentMessages.

Sorry about the size of this patch.

https://github.com/vector-im/riot-web/issues/7565
2019-04-01 16:42:41 +01:00
Bruno Windels a326c83016
Merge pull request #2842 from matrix-org/bwindels/bacat-scrolling-merged-develop
BACAT Scrolling
2019-03-29 14:02:15 +00:00
Travis Ralston 9b64dd0cd7 Support horizontal scrolling on breadcrumbs
Fixes https://github.com/vector-im/riot-web/issues/8714
Fixes https://github.com/vector-im/riot-web/issues/8890
Fixes https://github.com/vector-im/riot-web/issues/9034
Fixes https://github.com/vector-im/riot-web/issues/8954

This turned out to be much more complicated than it needed to be. We use an IndicatorScrollbar to do all the math for us and some minor changes have been made so it can flag left/right overflow. The complicated part is the css changes which make the gradients work: unlike the RoomSubList, we have to calculate the offset of the indicators (gradients) on our own because position:sticky doesn't work horizontally.

The changes to the css (well, mostly pointer-events:none) make it so the gradient doesn't interfere with the room avatars. 

9034 and 8954 are fixed by this because they represent an overflow-x:none style breakage where browsers won't let you scroll without a scrollbar. The gradient offset problem is also demonstrated in 8954.
2019-03-27 17:52:05 -06:00
Travis Ralston 64a6b47692
Merge pull request #2831 from matrix-org/travis/hidden-bing
Alert the user to unread notifications in prior versions of rooms
2019-03-27 13:23:57 -06:00
Nad Chishtie 5ac3905a37
Use same horizontal padding as room avatar to align to grid 2019-03-27 13:15:03 +01:00
Bruno Windels adf263c4af Merge branch 'develop' into bwindels/bacat-scrolling-merged-develop 2019-03-27 11:46:28 +01:00
Travis Ralston ddcb7a68bd
Merge pull request #2781 from matrix-org/travis/openid-widget
Widget OpenID reauth implementation
2019-03-27 03:42:39 -06:00
Travis Ralston 04a9038a05 Alert the user to unread notifications in prior versions of rooms
Fixes https://github.com/vector-im/riot-web/issues/8161
2019-03-26 19:22:41 -06:00
Bruno Windels 7e56a9a80e prevent resize handle hit area overlapping with (native) scrollbar 2019-03-26 17:14:58 +01:00
Travis Ralston d3268801ed Merge branch 'develop' into travis/openid-widget 2019-03-23 22:48:12 -06:00
Tee Mak 50ffdc2f12
Fixed drop shadow for tooltip.
The box-shadow color value is from $menu-box-shadow-color. The shadow now looks consistent on light or dark theme.
2019-03-22 14:50:13 -04:00
Bruno Windels 494779393f Merge branch 'develop' into bwindels/bacat-scrolling 2019-03-21 13:50:32 +01:00
Bruno Windels 71f6b08b26 first impl of new scrolling, still a bit broken 2019-03-19 13:42:22 +01:00
Michael Telatynski 5771406dd7 Add View Servers in Room to Devtools
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-03-18 23:21:21 +00:00
Travis Ralston f045beafc3 Support whitelisting/blacklisting widgets for OpenID 2019-03-15 21:33:31 -06:00
Travis Ralston f6e3437944 Update text in RoomUpgradeWarningBar to match suggestions 2019-03-15 16:08:35 -06:00
Travis Ralston da61e5e9d9 Merge branch 'develop' into travis/upgrade-warning 2019-03-15 15:32:49 -06:00
Travis Ralston 5cea8e846c
Merge pull request #2794 from matrix-org/travis/offline-members
Fix CSS syntax errors preventing offline member opacity from working
2019-03-15 08:46:56 -06:00
Travis Ralston 5b2ffd28e5
Merge pull request #2795 from matrix-org/travis/visible-chevron
Make the EntityTile chevron a masked SVG for theming
2019-03-15 08:44:23 -06:00
Bruno Windels 987a1a00b3 chrome apparently anchors the scroll position, which fights against our restore position logic. Disable it like this. 2019-03-15 10:16:21 +01:00
Bruno Windels dad382a4b7 use AutoHideScrollbar in memberlist 2019-03-15 10:16:21 +01:00
Bruno Windels 30d848b86e use AutoHideScrollbar in ScrollPanel 2019-03-15 10:16:21 +01:00
Travis Ralston 788041a774 Warn that members won't be invited to the new room in room settings 2019-03-14 17:33:34 -06:00
Travis Ralston e4181c4e3e Make the EntityTile chevron a masked SVG for theming
Fixes https://github.com/vector-im/riot-web/issues/7320
2019-03-14 15:59:00 -06:00
Travis Ralston 56620286b5 Fix CSS syntax errors preventing offline member opacity from working
Fixes https://github.com/vector-im/riot-web/issues/9178
2019-03-14 15:13:35 -06:00
J. Ryan Stinnett 990d6dec15 Fix initial letter avatar vertical offset in Firefox
In at least Firefox, the case of relative positioned inline elements (such as
mx_BaseAvatar) with absolute positioned children (such as mx_BaseAvatar_initial)
is a dark corner full of spider webs. It will give different results during full
reflow of the page vs. incremental reflow of small portions. While that's surely
a browser bug, we can avoid it by using `inline-block` instead of the default
`inline`.

Fixes https://github.com/vector-im/riot-web/issues/5594
Might help with https://github.com/vector-im/riot-web/issues/9088

See also https://bugzilla.mozilla.org/show_bug.cgi?id=1535053 and
https://bugzilla.mozilla.org/show_bug.cgi?id=255139 for more details on browser
behavior in this case.
2019-03-14 17:50:03 +00:00
J. Ryan Stinnett 45063cad4a
Merge pull request #2780 from jryans/auth-validation
Initial portions of support for Field validation
2019-03-14 10:19:21 +00:00
J. Ryan Stinnett a719839d9f Use a distinct color for selected autocomplete items
This restores the ability to see which autocomplete item is selected (which
seems to have gotten lost during redesign).

Fixes https://github.com/vector-im/riot-web/issues/9134
2019-03-12 14:51:37 +00:00
J. Ryan Stinnett b8925d857d Reorganize field validity styles
* The field border style was previously moved up to the field
* Validity colors should be shown regardless of focus state
2019-03-12 14:02:54 +00:00
Matthew Hodgson 40f16fa310 adds validation for fields.
* renames RoomTooltip to be a generic Tooltip (which it is)
 * hooks it into Field to show validation results
 * adds onValidate to Field to let Field instances call an arbitrary validation function

Rebased from @ara4n's https://github.com/matrix-org/matrix-react-sdk/pull/2550
by @jryans. Subsequent commits revise and adapt this work.
2019-03-12 14:02:54 +00:00
Travis Ralston 7eea62a22b
Merge pull request #2764 from matrix-org/travis/fix-hover
Fix sticky hover state by listening for hover on the document
2019-03-11 16:35:25 -06:00
Travis Ralston e1f9482107
Merge pull request #2757 from matrix-org/anoa/accept_all_invites
Ability to bulk accept all invites (and fix rejecting all invites)
2019-03-08 14:55:59 -07:00
J. Ryan Stinnett 1cefa44319 Redesign country dropdown to fit redesign
This tweaks colors of the country dropdown to blend in better with the rest of
the design.

Fixes https://github.com/vector-im/riot-web/issues/9048
2019-03-08 10:03:50 +00:00
Travis Ralston 241309ab83 Use CSS for hovering the tile 2019-03-07 14:55:17 -07:00
J. Ryan Stinnett 4a1b723ab5 Fix dropdown arrow on select field for auth flows 2019-03-07 14:57:58 +00:00
J. Ryan Stinnett 6441b2ed98 Ensure country dropdown uses light styling on auth
If the dark theme is activated, the country dropdown defaults to those colors
where it doesn't fit in with the always-light auth flow. This restyles its
colors to be light.
2019-03-06 16:45:54 +00:00
J. Ryan Stinnett 8beab58918 Use more nesting for auth body style overrides
No styles are changed here. This just groups them under one parent block to
avoid repeating `.mx_AuthBody`.
2019-03-06 16:37:16 +00:00
J. Ryan Stinnett 9d36ef0808 Fix background color of phone field label on dark theme
This adds extra styles to reset the field label background color on registration
even if dark theme is used.
2019-03-06 16:28:09 +00:00
Andrew Morgan 0f14d89257 Ability to bulk accept all invites 2019-03-06 14:06:53 +00:00
J. Ryan Stinnett 8bf5e1d19f
Merge pull request #2749 from jryans/auth-field
Use Field component in auth flows
2019-03-06 11:18:24 +00:00
J. Ryan Stinnett dde36459e6 Simplify field row / field styles 2019-03-06 11:11:24 +00:00
David Baker c1056025ed
Merge pull request #2748 from matrix-org/dbkr/shameless_plugging
Support linking to hosting providers
2019-03-05 18:22:02 +00:00
J. Ryan Stinnett bc54ea5623 Convert login type to Field component
This converts the login type Dropdown on the login flow to also use the Field
component so that every presents a similar visual style.
2019-03-05 17:58:42 +00:00
J. Ryan Stinnett 5a491ac053 Convert login inputs to Field component
As with other auth flows, this converts inputs on the login page to use the
Field component for consistent styling. The login type dropdown is left as-is
for now.
2019-03-05 17:58:42 +00:00
J. Ryan Stinnett 5b1d361577 Convert registration phone number to Field component
Now that we have prefix support in the Field component, we can also convert the
phone number with country dropdown on registration.
2019-03-05 17:58:42 +00:00
David Baker 2055be36f1 Add the image 2019-03-05 16:49:12 +00:00
David Baker 57d8f6d8a2 Support linking to hosting providers
From link in app config
2019-03-05 16:12:02 +00:00
J. Ryan Stinnett 26b2aa174b Add prefix support to Fields
This allows Fields to have an optional prefix component which is placed inside
the border of the Field and to the left of the input. Since this label animation
would be complex to get right for this case, it is instead fixed to the top left
if there is a prefix component.

This canonical example of this today would be a phone number field which
includes a country dropdown.
2019-03-05 15:25:43 +00:00
J. Ryan Stinnett ae5c32d28b Lift border up to the Field root
By placing the Field's border on the Field component root instead of the input,
it's easier to wrap it around additional elements that we'll soon stuff inside
the field.
2019-03-05 15:25:43 +00:00
J. Ryan Stinnett bfe120fbf4 Convert registration to Field component
This converts most fields in the registration form to use the Field component,
except for the phone number, which is a left as a separate task because of the
country dropdown menu.
2019-03-05 15:25:42 +00:00
Bruno Windels 96196d8c3d
Merge pull request #2746 from matrix-org/bwindels/flairnolayout
Prevent flair pushing timeline downwards
2019-03-05 15:34:09 +01:00
Bruno Windels 18d897298d ensure flair is 16px high
so it doesn't push the message down
2019-03-05 14:49:07 +01:00
J. Ryan Stinnett 1336508a4e Add comment, fix bad math
This adds a comment to explain the `max-width` and also fixes it actually use
the right value. (I had grabbed the wrong part of `margin` the first time.)
2019-03-05 11:13:39 +00:00
J. Ryan Stinnett c1688d2be3 Limit Field label to size of input
This avoids awkward wrapping if the label is longer than the input. This will
show an ellipsis to suggest there's more text in the label than can be shown.
2019-03-04 18:02:36 +00:00
Travis Ralston 8a6ae6b48e Use a mask for the continuation icon
Fixes https://github.com/vector-im/riot-web/issues/7990
2019-03-01 15:59:19 -07:00
Travis Ralston 3ce2c3a76d
Merge pull request #2724 from matrix-org/travis/stacked-dialogs
Support stacking dialogs to prevent unmounting
2019-03-01 09:03:39 -07:00
Travis Ralston 5a4676ac66
Merge pull request #2725 from matrix-org/travis/settings/pl-dropdowns
Convert PowerSelector to use mxField instead
2019-03-01 09:03:16 -07:00
Travis Ralston a41df7ab68 Convert PowerSelector to use mxField instead 2019-02-28 19:00:57 -07:00
Travis Ralston 0978ab3da0 Support stacking dialogs to prevent unmounting
Fixes https://github.com/vector-im/riot-web/issues/8371
2019-02-28 15:55:58 -07:00
Bruno Windels 69016e32a4 fix margin on e2e icon in member panel 2019-02-28 15:39:10 +01:00
J. Ryan Stinnett bd577e8f9b
Merge pull request #2714 from jryans/field-click-label
Send Field label pointer events to input
2019-02-27 17:07:08 +00:00
J. Ryan Stinnett e9490b3032 Send Field label pointer events to input
When the `label` element is displayed on top of the input (`label` is set and
there is no `placeholder`), it would block clicks from reaching the input. This
allows them to get through, but then also restores `label`'s events once it
moves out of the way.

Fixes https://github.com/vector-im/riot-web/issues/8469
2019-02-27 13:23:48 +00:00
J. Ryan Stinnett 209ac2c587
Merge pull request #2706 from jryans/move-non-feather-icons
Move non-feather icons out of feather dir
2019-02-27 13:08:23 +00:00
J. Ryan Stinnett 404c60fb0e Keep registration spinner inside the auth modal
The spinner was taking on the full height of the modal and escaping off the
page. This keeps it contained inside the modal.

Fixes https://github.com/vector-im/riot-web/issues/8661
2019-02-27 11:21:39 +00:00
J. Ryan Stinnett 4b340450b9 Rename Feather icon directory to `feather-customised`
These icons are based on Feather as the original source, but they have various
tweaks applied, such as stroke width, color, etc. Hopefully the tweaked name
makes this more obvious in the future.
2019-02-27 10:42:10 +00:00
J. Ryan Stinnett 1a89a4e87d Move logos out of feather dir
These clearly aren't from the Feather set.
2019-02-26 20:41:33 +00:00
J. Ryan Stinnett 3b3f0ea957 Move E2E icons out of feather dir
They appear to all be created by Nad, according to
https://github.com/matrix-org/matrix-react-sdk/pull/2557.
2019-02-26 20:31:32 +00:00
J. Ryan Stinnett 426bdafe22
Merge pull request #2672 from jryans/password-validation
Report validity state of all registration fields on any change
2019-02-26 18:20:38 +00:00
Bruno Windels 0a404d5adc
Merge pull request #2702 from matrix-org/nadonomy/room-list
Normalise room list font weight, bold unreads
2019-02-26 10:43:21 +01:00
Travis Ralston 18b27a72d8
Merge pull request #2692 from matrix-org/t3chguy/room_context_menu_settings
Settings button in Room Context Menu
2019-02-25 20:28:38 -07:00
Michael Telatynski 8d149575ea Merge branches 'develop' and 't3chguy/room_context_menu_settings' of github.com:matrix-org/matrix-react-sdk into t3chguy/room_context_menu_settings 2019-02-25 23:12:06 +00:00
Michael Telatynski d4b6ce6932 Apply PR feedback, don't change room to go to its settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-25 23:08:51 +00:00
Michael Telatynski dd9077f1e4 Merge branches 'develop' and 't3chguy/pretty_Devtools' of github.com:matrix-org/matrix-react-sdk into t3chguy/pretty_Devtools 2019-02-25 22:39:37 +00:00
Michael Telatynski 56d58f8600 make better use of space
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-25 22:38:33 +00:00
Michael Telatynski 5bdd61111d Fix textareas
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-25 22:12:06 +00:00
Nad Chishtie 88dfd3287f Normalise room list font weight and make bold when there are unreads. 2019-02-25 11:02:27 -07:00
Travis Ralston 4801b25f77 Merge remote-tracking branch 'origin/develop' into travis/settings-cleanup-1 2019-02-25 09:40:50 -07:00
Travis Ralston 2b9b07c29d
Merge pull request #2696 from matrix-org/t3chguy/pretty_view_source
make ViewSource less awkward
2019-02-24 17:55:07 -07:00
Michael Telatynski 7b88d5d21c make ViewSource less awkward
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-24 03:43:44 +00:00
Michael Telatynski fa5f1df194 Fix z ordering of the overflow tile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-24 03:18:21 +00:00
Travis Ralston bd54a401bc Sort settings tabs into a logical structure
Fixes https://github.com/vector-im/riot-web/issues/8864
2019-02-22 11:33:03 -07:00
Travis Ralston 2903a0e712 Rework EditableItemList to support mxField
Also improves upon the general UX to be a bit friendlier for direct manipulation things.
2019-02-21 15:22:08 -07:00
Bruno Windels ab9bf4c0e0
Merge pull request #2666 from matrix-org/bwindels/userview
Bring back user view
2019-02-21 16:05:03 +01:00
J. Ryan Stinnett 8e32798f45 Ensure fields with errors are clearly visible
Until we have better validation, let's at least ensure fields with errors are
properly marked via color.
2019-02-21 14:44:39 +00:00
Bruno Windels ef704085f9 remove display: flex declarations now present on mx_MainSplit itself 2019-02-21 10:50:41 +01:00
Bruno Windels b364c9cb8e update copyright header 2019-02-21 10:50:30 +01:00
J. Ryan Stinnett 567280ae3d Remove unreferenced images
Now that images flow through a build step, it's easy to spot which ones aren't
actually used. To determine this, I built Riot with the hash in file names
disabled, and then used a directory compare tool to look for all images in the
SDK that did not make it into the Riot build.

Fixes https://github.com/vector-im/riot-web/issues/8158
2019-02-20 18:33:00 +00:00
Bruno Windels f11505a9de bring back user page
Adds a UserView that contains a MainSplit with an empty div
and a RightPanel, preset to the given member.

UserView fetches the profile and creates a fake member, which
it passed on to the RightPanel.

this doesn't use the view_user action on purpose, to avoid any
interference of the UserView when trying to view a room member.
2019-02-20 12:45:55 +01:00
Aaron Raimist c16791814e
Set event-sending-color in dark theme
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-19 19:58:11 -06:00
J. Ryan Stinnett edf10dbdde
Merge pull request #2659 from jryans/dark-theme-more-2
Dark theme follow ups round 2
2019-02-19 17:51:29 +00:00
J. Ryan Stinnett e7a84b33e8
Merge pull request #2653 from matrix-org/benp/prevent-accidental-username-clicking
make mx_SenderProfile inline-block, reduces clickable area around usernames
2019-02-19 12:26:27 +00:00
J. Ryan Stinnett b7cb16242b Tweak light theme color values 2019-02-19 11:49:49 +00:00
J. Ryan Stinnett 5fb990eb5f Convert Markdown button to SVG mask
This makes it easier to theme via CSS, which helps with the dark theme.
2019-02-18 18:26:52 +00:00
J. Ryan Stinnett 09ed795c79 Allow theming member info minimise button 2019-02-18 16:02:10 +00:00
J. Ryan Stinnett 19977b052f Add new var for dark panel bg color 2019-02-18 13:50:17 +00:00
J. Ryan Stinnett fdd88b60a6 Lift panel input styling up to common 2019-02-18 13:43:18 +00:00
J. Ryan Stinnett 98a3ecbcb5 Tweak placeholder styles to also affect member search 2019-02-18 13:34:25 +00:00
J. Ryan Stinnett 96f1538420 Remove bad syntax for input placeholder styles 2019-02-18 12:20:47 +00:00
J. Ryan Stinnett 3475b6faed Remove light styles that duplicate common 2019-02-18 12:19:46 +00:00
J. Ryan Stinnett e16f29b1e0 Use darker color of photo lightboxes for dialogs on dark theme 2019-02-18 12:14:55 +00:00
J. Ryan Stinnett 52bd1edd72 Tweak room and group pill color for dark theme 2019-02-18 11:41:23 +00:00
J. Ryan Stinnett 402992cee4 Adjust add room button for dark theme 2019-02-18 11:34:25 +00:00
J. Ryan Stinnett c490606f15 Revert back to previous base color on dark theme 2019-02-18 11:34:25 +00:00
J. Ryan Stinnett fa3662257d Tweak widget bar color for dark theme 2019-02-18 11:34:25 +00:00
Aaron Raimist 9318c4ec78
Update dark theme bg-color to show hover effect on messages
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-16 12:55:35 -06:00
Travis Ralston 25525f93d2
Merge pull request #2655 from aaronraimist/fix-pre-dark
Make pre use the same text color as code
2019-02-16 11:36:26 -07:00
Aaron Raimist 9bc0ae7fc5
Add comment
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-16 12:28:42 -06:00
Travis Ralston b27f3688f1
Merge pull request #2649 from AndrewJDR/reinstate_lowered_opacity_for_offline_avatars
Bring back the lowered opacity for offline/unavailable avatars.
2019-02-15 22:42:25 -07:00
Aaron Raimist 459f9d4fbc
Set h3-color in dark theme
This is things like "INVITED" in memberlist

Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-15 21:56:47 -06:00
Aaron Raimist eb908dbd0d
Make pre use the same text color as code
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-15 21:38:49 -06:00
Ben Parsons 3f8ff77b7e make mx_SenderProfile inline-block, stops accidental name inserting 2019-02-15 15:55:16 +00:00
J. Ryan Stinnett 91c91c5ca9 Restore previous redacted message look in dark theme 2019-02-15 15:15:23 +00:00
Bruno Windels d40da42268
Merge pull request #2647 from matrix-org/bwindels/e2eiconwholeeventhover
highlight e2e icon on event when hovering whole event
2019-02-15 15:26:20 +01:00
Bruno Windels 7ce8ab0fd0 Merge branch 'master' into develop 2019-02-15 13:53:29 +01:00
Bruno Windels c39c0e4834 fix for the ... button not being aligned for group invite tiles 2019-02-15 13:07:33 +01:00
Andrew Johnson 85930fca70 Bring back the lowered opacity for offline/unavailable avatars.
At some point during the riot redesign, the bit of css that lowered the opacity for offline/unavailable contacts
was removed. This makes it impossible to discern presence for a contact unless you hover your cursor over their
avatar.

It's very handy to be able to see presence at a glance without any hovering, so this PR reintroduces the lowered opacity.
I've also slightly decreased the opacity level from 0.66 to 0.5 to make it slightly more noticable.
2019-02-15 03:31:55 -08:00
Bruno Windels 840f3cede8 highlight e2e icon on event when hovering whole event 2019-02-14 18:04:15 +01:00
Nad Chishtie eec761a921
Merge pull request #2633 from matrix-org/nadonomy/icon-diet
Skinnified more icons
2019-02-14 16:53:58 +00:00
J. Ryan Stinnett df5f0601aa
Merge pull request #2641 from matrix-org/dbkr/remove_welcome_from_topleft
Remove 'welcome' from top-left menu
2019-02-14 16:40:39 +00:00
Travis Ralston 96619afc7c Fix icons being cut off in settings
Fixes https://github.com/vector-im/riot-web/issues/8578
2019-02-14 09:09:07 -07:00
Bruno Windels ae945eaf12
Merge pull request #2642 from matrix-org/bwindels/e2eiconhover
make e2e icons on message transparent
2019-02-14 17:06:02 +01:00
Bruno Windels 84b53faf9e make e2e icons on message transparent 2019-02-14 17:00:47 +01:00
David Baker 7845a63506 Remove 'welcome' from top-left menu
Tjis is quite confusing as the welcome page is designed for when
you're not logged in, ie. has a sign-in button. There's also no way
to get back into the app so it really looks like it's logged you
out.

Reverts 116367fd69
2019-02-14 15:53:52 +00:00
Bruno Windels 89792459ff fix close button being half off screen 2019-02-14 16:51:45 +01:00
Nad Chishtie 9aa3640e93 Tweaked more icons. 2019-02-13 19:44:45 +00:00
J. Ryan Stinnett 694a59afb7
Merge pull request #2628 from jryans/adjust-top-left-menu
Adjust top left menu items
2019-02-13 17:38:08 +00:00
J. Ryan Stinnett ed0fc12f98 Tweak stroke width 2019-02-13 16:17:40 +00:00
J. Ryan Stinnett 116367fd69 Add welcome to top left menu for all 2019-02-13 16:13:32 +00:00
Nad Chishtie 4aa0f56b06 Normalised icon strokes to 1px 2019-02-13 16:11:18 +00:00
J. Ryan Stinnett 22789ada94 Add sign in to top left menu for guests 2019-02-13 16:01:13 +00:00
J. Ryan Stinnett 422750082d Tweak pill bg color for dark theme 2019-02-13 15:11:29 +00:00
J. Ryan Stinnett 5f6907c85e Improve gradients for Safari 2019-02-13 15:06:40 +00:00
J. Ryan Stinnett f64f39f773 Tweak box shadow on dark theme 2019-02-13 15:06:40 +00:00
J. Ryan Stinnett 93324896f3 Force authpage to act like light theme 2019-02-13 14:24:03 +00:00
J. Ryan Stinnett feb92957c0 Use notice colors for E2E icons 2019-02-13 14:05:45 +00:00
J. Ryan Stinnett 4409636c0b Tweak panel button divider color 2019-02-13 13:57:59 +00:00
J. Ryan Stinnett fb4fd54f6f Stop gradients at panel bg color 2019-02-13 13:48:56 +00:00
J. Ryan Stinnett c8edd6b417 Route header panel bg color to left and right panels 2019-02-13 13:17:50 +00:00
J. Ryan Stinnett e09963cdfb Tweak dark theme color values 2019-02-13 13:10:55 +00:00
Matthew Hodgson 4c56b45a9f back out bold unread 2019-02-13 12:46:08 +00:00
Matthew Hodgson 8464155663 fix topic & room name alignment in header 2019-02-13 12:16:09 +00:00
J. Ryan Stinnett e6f9b7a109
Merge pull request #2619 from matrix-org/jryans/dark-theme-redesign
Add redesigned dark theme
2019-02-13 11:45:30 +00:00
J. Ryan Stinnett 59b58cbbac Restore highlighted right panel marker 2019-02-13 11:31:30 +00:00
Will Hunt c9e11050f2
Merge pull request #2610 from matrix-org/hs/weighting-for-rooname
Fix mx_RoomTile_name weighting
2019-02-13 11:24:05 +00:00
J. Ryan Stinnett 1359ac62cb Tweak header divider line 2019-02-13 10:52:03 +00:00
J. Ryan Stinnett 7bad8d594d Move common input styles out of themes 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett 72f1b79b1d Tweak create key backup input for dark theme 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett b13baf8926 Tweak start a chat for dark theme 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett a7bae30837 Tweak create community for dark theme 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett 932b377dc5 Restore color inversion from old dark theme 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett b0d08b9a25 Rename dharma theme to light theme 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett 6c954dadc8 Allow theming message composer buttons 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett e1edd56643 Allow theming group header buttons 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett 3cba5edd6f Allow theming right panel header buttons 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett 8652a094f3 Allow theming room header buttons 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett c00495304f Explicit color for tagpanel buttons 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett d7fb39fd08 First pass at dark theme colors 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett fe364d4140 Update global colors in default theme 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett f2db509394 Update username variants 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett 6e2cef10d9 Remove incorrect unused comment 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett dda755dd5a Fix up syntax in default theme 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett 3b200705ed Remove light theme 2019-02-13 10:47:04 +00:00
Bruno Windels de8cd88418
Merge pull request #2621 from matrix-org/bwindels/tabsdivider
Add divider between tabs and regular buttons in room header
2019-02-13 11:00:52 +01:00
Bruno Windels 875f792728
Merge pull request #2620 from matrix-org/bwindels/e2eiconsanddialog
Fixes and styling related to e2e icons and dialogs
2019-02-13 09:18:58 +01:00
Bruno Windels 12b6383831
Merge pull request #2618 from matrix-org/bwindels/fixstickers
Fix: stickers layout
2019-02-13 09:17:21 +01:00
Bruno Windels 27a5211239
Merge pull request #2616 from matrix-org/bwindels/settingstoggle
Fix: dont assume settings label only has one line
2019-02-13 09:17:03 +01:00
Bruno Windels 5047d15a3b
Merge pull request #2615 from matrix-org/bwindels/breadcrumbs
Labs feature: recent room breadcrumbs
2019-02-13 09:16:40 +01:00
Matthew Hodgson 914b3e70d5 make warning triangle less random 2019-02-12 20:03:37 +00:00
Will Hunt e2cecad535
Update _RoomTile.scss 2019-02-12 19:21:31 +00:00
Bruno Windels ccaa017980 add divider between tabs and regular buttons in room header 2019-02-12 20:05:01 +01:00
Bruno Windels 4d3cc0a53f fix e2e icon top offset in compact mode 2019-02-12 19:14:46 +01:00
Bruno Windels 3b10b8042a restyle unknown devices dialog 2019-02-12 18:34:35 +01:00
Bruno Windels 92668628ec fix sticker layout 2019-02-12 16:55:37 +01:00
Will Hunt 946a910692
Probably could reduce it to this? 2019-02-12 12:06:53 +00:00
Will Hunt 56bb6c870a
You are no longer needed 2019-02-12 12:06:23 +00:00
Bruno Windels 108cd6d671 dont assume settings label only has one line 2019-02-12 12:50:23 +01:00
Bruno Windels 24cb46a991 should be on the left with animations so the animate class can clear it 2019-02-12 12:22:50 +01:00
Bruno Windels 229d905835 copyright 2019-02-12 12:21:40 +01:00
Bruno Windels 2315e4bfb4 add animation when adding a room 2019-02-12 12:16:56 +01:00
David Baker c2247cdc67
Merge pull request #2613 from matrix-org/dbkr/sas_profile
Add display name / avatar to incoming sas dialog
2019-02-12 10:48:49 +00:00
Bruno Windels 5efd92f3ec make rooms come in from left rather than the right 2019-02-12 11:26:46 +01:00
Bruno Windels aaea40a93d add breadcrumbs component 2019-02-12 11:04:25 +01:00
David Baker 99ae63c021 Add display name / avatar to incoming sas dialog
Fetch the other user's profile & display it on an incoming verification
request
2019-02-11 15:57:34 +00:00
Travis Ralston e7e322d513
Merge pull request #2604 from matrix-org/travis/settings/scale-up
Scale up settings UI to be easier to read
2019-02-11 07:58:10 -07:00
Will Hunt 4a46a3e4e0
Fix mx_RoomTile_name weighting 2019-02-11 13:54:52 +00:00
Will Hunt 119806bdbd
!important shouldn't have a space
I wonder if this is making SCSS choke.
2019-02-11 13:31:06 +00:00
Matthew Hodgson 84082ebb34 fix horizontal CSS scrollbars on webkit 2019-02-10 22:35:37 +00:00
Travis Ralston 60950b258a Scale up settings UI to be easier to read
Part of https://github.com/vector-im/riot-web/issues/8207
2019-02-08 15:23:14 -07:00
David Baker 742af81224
Merge pull request #2594 from matrix-org/dbkr/dont_verify_restore
Prompt to restore backup rather than verify
2019-02-08 17:49:04 +00:00
David Baker a00c803f8d
Merge pull request #2600 from jryans/update-avatar-colors
Update avatar colors
2019-02-08 17:41:39 +00:00
J. Ryan Stinnett 69af0b82c8 Update avatar colors 2019-02-08 17:34:01 +00:00
Travis Ralston 0ca6ea20d9
Merge pull request #2591 from matrix-org/travis/settings/disable-topic
Render disabled mxField textareas as disabled
2019-02-08 10:28:34 -07:00
David Baker f99c56fedb
Merge pull request #2597 from matrix-org/jryans/add-welcome-page
SDK support for welcome page
2019-02-08 17:17:22 +00:00
Travis Ralston debac60980 Include input and select labels in disabled stlyes 2019-02-08 09:52:14 -07:00
David Baker 9b4a6cf442 Make prettier 2019-02-08 16:27:25 +00:00
Travis Ralston cf1366635f Merge branch 'develop' into travis/settings/disable-topic 2019-02-08 09:25:51 -07:00
David Baker ae16cc36aa Change SAS to decimal / emoji
Requires https://github.com/matrix-org/matrix-js-sdk/pull/837
2019-02-08 14:57:36 +00:00
J. Ryan Stinnett 5ab3c8b823 Add top left home menu item when home page configured 2019-02-08 13:48:51 +00:00
J. Ryan Stinnett 7238c713d7 Add language selector to bottom of welcome 2019-02-08 11:39:30 +00:00
David Baker 539dd08c3b
Merge pull request #2586 from matrix-org/dbkr/sas_no_click
Remove click-to-verify from SAS
2019-02-08 10:18:26 +00:00
Travis Ralston e5934c12b4 Render disabled mxField textareas as disabled
Fixes https://github.com/vector-im/riot-web/issues/8440
2019-02-07 11:58:15 -07:00
David Baker 4728ddf515 Forgot the CSS file 2019-02-07 17:53:41 +00:00
Bruno Windels d4ed0bc038 make sure scroller doesn't overflow parent 2019-02-07 17:08:40 +00:00
David Baker 3a924d05b5 Remove click-to-verify from SAS
The click-each-pair to verify was hard to discover, so remove it
2019-02-07 17:01:55 +00:00
Travis Ralston 5b4ebf3b76
Merge pull request #2579 from matrix-org/travis/settings/fix-ff-scroll
Fix firefox scrolling settings tabs differently
2019-02-07 08:14:08 -07:00
Bruno Windels 5b85f8928d show a hand cursor on the badge while we're at it 2019-02-07 13:40:50 +00:00
Bruno Windels 87ddb8a453
Merge pull request #2575 from matrix-org/bwindels/customtags
Bring back custom tags, also badges on communities
2019-02-07 11:37:17 +00:00
J. Ryan Stinnett 73de56d72d Generalize HomePage into EmbeddedPage 2019-02-07 11:12:28 +00:00
Bruno Windels 7b23fa7a4f implement PR feedback 2019-02-07 10:49:23 +00:00
Travis Ralston 9ca1e875a3 Fix firefox scrolling settings tabs differently
Fixes https://github.com/vector-im/riot-web/issues/8408
2019-02-06 14:11:09 -07:00
Travis Ralston 04f2375273 Add issue references to things 2019-02-06 11:06:02 -07:00
Travis Ralston b2c161c7c1 Merge branch 'develop' into travis/settings/delete-the-old 2019-02-06 11:02:21 -07:00
Bruno Windels 699023ea40 prevent tagtiles jumping when selected 2019-02-06 16:53:48 +00:00
Bruno Windels 97db9cd99e fix css regression of context menu 2019-02-06 14:24:44 +00:00
Bruno Windels 0ab6ab639e render badge on custom tag in LLP 2019-02-06 11:21:50 +00:00
Bruno Windels b79394722a make sure scrollbar is at the far right edge of the LLP 2019-02-05 18:03:16 +00:00
Bruno Windels 604020dd59 add selectable custom tags below tag panel 2019-02-05 17:39:02 +00:00
Bruno Windels bdc7936130 move help & communities button out of tag panel
so we can shove the custom tag buttons between them
in the next commit
2019-02-05 17:36:33 +00:00
J. Ryan Stinnett 36bf06d87a Tweak field padding to avoid overlapping with selected text 2019-02-05 15:50:56 +00:00
Travis Ralston eac50aa800 Remove old user and room settings
This takes out the old user and room settings, replacing the paths with the new dialog editions. The labs setting has been removed in order to support this change.

In addition to removing the old components outright, some older components which were only used by the settings pages have been removed. The exception is the ColorSettings component as it has a high chance of sticking around in the future.

Styles that were shared by the settings components have been broken out to dedicated sections, making it easier to remove the old styles entirely.

Some stability testing of the app has been performed to ensure the app still works, however given the scope of this change there is a possibility of some broken functionality.
2019-02-04 13:40:21 -07:00
Bruno Windels a6914274b0
Merge pull request #2565 from matrix-org/bwindels/widgetmakeover
Redesign: widget makeover
2019-02-02 07:30:45 +00:00
J. Ryan Stinnett 694b25661d
Merge pull request #2564 from jryans/dropdown-chevron
Restore dropdown chevron to right
2019-02-01 16:32:04 -06:00
Bruno Windels 7ccc694eea minimal theming on app permission in widget 2019-02-01 23:24:56 +01:00
Bruno Windels e2ce12f5c1 wip 2019-02-01 23:15:14 +01:00
J. Ryan Stinnett 84ba22f7d6 Give auth language dropdown more space 2019-02-01 16:15:11 -06:00
J. Ryan Stinnett d3e2c33bfa Push dropdown chevron to right side 2019-02-01 16:06:46 -06:00
Bruno Windels 45e982ac13
Merge pull request #2557 from matrix-org/bwindels/e2eicons
Add e2e icon to room header/composer/member info, more ...
2019-02-01 22:02:28 +00:00
J. Ryan Stinnett 68ec63d25e
Merge pull request #2562 from jryans/rm-guest-bar
Remove guest warning bar
2019-02-01 15:46:43 -06:00
J. Ryan Stinnett 3bfd603dab Remove guest warning bar 2019-02-01 15:28:16 -06:00
J. Ryan Stinnett 10a7d7ed42
Merge pull request #2561 from jryans/auth-bg
Style tweaks to support auth background
2019-02-01 14:13:22 -06:00
J. Ryan Stinnett 0b14855c4f Add footer gradient 2019-02-01 12:50:22 -06:00
J. Ryan Stinnett 6dfc9b4f79 Change footer to padding 2019-02-01 12:48:26 -06:00
J. Ryan Stinnett bcac332d31 Remove unneeded backdrop on auth pages 2019-02-01 12:46:17 -06:00
Travis Ralston b68ee8ac6a Set a minimum width on the settings tab content
This prevents random controls from squishing themselves, at sacrifice of scrollbars and not-responsiveness.
2019-02-01 11:43:42 -07:00
Bruno Windels a09133960c pr feedback 2019-02-01 19:16:06 +01:00
Bruno Windels 571c059f0d fix layout 2019-02-01 18:15:19 +01:00
Bruno Windels 9134548558 update room status bar warning icon 2019-02-01 17:52:57 +01:00
Bruno Windels ce5e56aaac update icons in member info device section 2019-02-01 17:32:46 +01:00
Bruno Windels 21fe266394 add icon to member info to indicate all devices of a user are trusted 2019-02-01 17:08:09 +01:00
Bruno Windels 48c0e5a3ac update icons 2019-02-01 16:44:16 +01:00
Bruno Windels 88ad780b6b update message e2e icons
also remove encrypted icon as header/composer already indicate encryption
2019-02-01 16:43:12 +01:00
Bruno Windels 09c3391dd8 replace existing icon in composer with the new one 2019-02-01 13:40:42 +01:00
Bruno Windels f2928c184d create warning/verified icon to use in header/composer/member info 2019-02-01 13:39:56 +01:00
Travis Ralston b12b731781 Minor CSS tweaks 2019-01-31 21:20:30 -07:00
Travis Ralston 4036e52c24 Fixed settings dialog header; Adjust padding on dialog
Some recent changes to dialogs changed how this works and altered the look of the settings dialogs. This fixes that and makes it so that the header and content scroll independently.

Fixes https://github.com/vector-im/riot-web/issues/8329
Fixes https://github.com/vector-im/riot-web/issues/8328
2019-01-31 15:52:22 -07:00
Matthew Hodgson 786e725f5f
Merge pull request #2544 from matrix-org/matthew/gradients
make overflow gradients much smaller and turn bottom into drop shadow
2019-01-31 20:18:35 +01:00
J. Ryan Stinnett 2f006939f2 Use mx_AuthBody prefix for consistency 2019-01-31 10:06:35 -06:00
Bruno Windels f60cfe5cb2
Merge pull request #2545 from matrix-org/bwindels/missingavatarlayout
layout composer independent of avatar being present
2019-01-31 14:41:44 +00:00
Bruno Windels afed1b725d layout composer independent of avatar being present 2019-01-31 15:13:18 +01:00
Matthew Hodgson c432c79953 remove the bottom gradient entirely for now 2019-01-31 15:03:32 +01:00
Matthew Hodgson 1ee0dc4b66 make overflow gradients much smaller and turn bottom into drop shadow 2019-01-31 13:31:55 +01:00
Matthew Hodgson f658288f2b
Merge pull request #2543 from matrix-org/matthew/cyrillic
Matthew/cyrillic
2019-01-31 13:11:14 +01:00
Matthew Hodgson 47f775f579 apply correct weight on unread roomtiles 2019-01-31 13:10:11 +01:00
Matthew Hodgson ac620c7a05 fix bg color on selects 2019-01-31 13:10:11 +01:00
Bruno Windels 60f28266ae
Merge pull request #2538 from matrix-org/bwindels/community-redesign-cleanup
Redesign: community page cleanup
2019-01-31 12:01:08 +00:00
Matthew Hodgson 2fc6f89953 remove italics CSS skew 2019-01-31 11:51:26 +01:00
Matthew Hodgson bc83a79ac6 support cyrillic nunito 2019-01-31 11:43:06 +01:00
Matthew Hodgson a1097b5f03 support cyrillic nunito 2019-01-31 11:42:57 +01:00
J. Ryan Stinnett 6718ae8b7c Set standard font size for fields 2019-01-30 17:52:18 -06:00
J. Ryan Stinnett d6f55a508c Use custom appearance and arrow for select fields 2019-01-30 16:40:53 -06:00
J. Ryan Stinnett b093119d30 Move dropdown arrow to primary element 2019-01-30 16:39:08 -06:00
J. Ryan Stinnett de46e6aa0d Use dropdown-arrow for all toggle arrows 2019-01-30 16:39:07 -06:00
Bruno Windels 405cc5cc24 show avatars for members & rooms in group like we do in room right panel
also apply padding with hacky :not selector to exclude full-width avatar
2019-01-30 16:59:28 +01:00
Bruno Windels c9900deebe center invite button caption 2019-01-30 16:24:25 +01:00
Bruno Windels be0de104ff make group header as tall as top left menu/room header 2019-01-30 16:24:02 +01:00
Bruno Windels 3a8e0aec48
Merge pull request #2533 from matrix-org/bwindels/avoidcomposerhscroll
avoid horizontal scrollbar in composer when placeholder doesn't fit
2019-01-30 12:35:10 +00:00
Bruno Windels 13b97ee332 avoid horizontal scrollbar in composer when placeholder doesn't fit 2019-01-30 12:53:15 +01:00
David Baker ae7b89eae9
Merge pull request #2530 from matrix-org/bwindels/minorfixup
Redesign: tiny fix: stretch device label in member info if content doesn't fill it
2019-01-30 11:43:13 +00:00
Bruno Windels 4d2a93eaaf
Merge pull request #2527 from jryans/auth-registration
Style registration flow
2019-01-30 11:27:45 +00:00
Bruno Windels 3f7f984536 also don't stretch buttons when text is larger 2019-01-30 11:23:31 +01:00
Bruno Windels 015c14237d stretch device label in member info if content doesn't fill it 2019-01-30 11:20:20 +01:00
Bruno Windels 6aca7e4515
Merge pull request #2522 from matrix-org/bwindels/memberpanel-tiny-makeover
Redesign: small member info panel makeover
2019-01-30 10:01:33 +00:00
Travis Ralston 68cd87a1c7 Fix indentation on all new settings CSS 2019-01-29 23:11:16 -07:00
Travis Ralston bdf2bb5601
Merge pull request #2526 from matrix-org/travis/settings/fixes-1
Round 1 of misc fixes for settings
2019-01-29 22:59:07 -07:00
Travis Ralston f86e224db6 Merge branch 'experimental' into travis/rsettings/tab/security 2019-01-29 22:15:55 -07:00
Travis Ralston 4d0a246629 Put a little padding between section headings 2019-01-29 19:28:30 -07:00
Travis Ralston f050323f98 Inherit font size from other elements for push notifications table 2019-01-29 19:18:13 -07:00
Travis Ralston 2aee2df6e9 Fix usage of semibold fonts
Fixes https://github.com/vector-im/riot-web/issues/8275
2019-01-29 19:11:04 -07:00
J. Ryan Stinnett 25a2c3fe4d Tweak dropdown font 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 01d28bc137 Squeeze country dropdowns to match design 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 16b4f8fb6d Use new arrow for all dropdowns 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 92394ba601 Change country dropdown to be smaller with arrow on right 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett daee5f0325 Reorganize registration inputs 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 88fd2e79cd Prune unused auth styles 2019-01-29 17:38:28 -06:00
Travis Ralston 0af419633f Implement the Roles & Permissions tab of new room settings
This is largely copy/paste from the current room settings
2019-01-29 15:54:51 -07:00
Travis Ralston a2f516c461 Implement the Security & Privacy tab of new room settings 2019-01-29 14:31:07 -07:00
Bruno Windels 7d6f551841 small makeover of member info panel
this removes the style sharing between the verify buttons in the memberinfo panel and
and the encrypted event dialog because the diverge too much now.
2019-01-29 21:14:16 +01:00
Bruno Windels 855dbd7d2b Merge branch 'experimental' into bwindels/roomdirectory-makeover 2019-01-29 18:33:03 +01:00
Bruno Windels 15a74cac15 Merge branch 'experimental' into bwindels/redesign-smallfixes 2019-01-29 18:30:08 +01:00
Bruno Windels 1b82ec6e36 make resize handle not overlap with left panel sublist scrollbars 2019-01-29 18:01:29 +01:00
Travis Ralston c090118815
Merge pull request #2516 from matrix-org/travis/rsettings/tab/general
Implement the "general" tab of new room settings
2019-01-29 09:41:32 -07:00
J. Ryan Stinnett 049ad40061 Tweak auth overflow on Windows and Linux 2019-01-29 10:19:16 -06:00
Travis Ralston ad276c1fda Merge branch 'experimental' into travis/rsettings/tab/general 2019-01-29 09:11:21 -07:00
Bruno Windels 6ffc5e093d add icons to top left menu options 2019-01-29 16:56:07 +01:00
Bruno Windels 9f1b4ac4cc room directory makeover 2019-01-29 15:34:58 +01:00
Bruno Windels cc2b6f9524
Merge pull request #2470 from matrix-org/bwindels/css-scrollbars
Make native scrollbars prettier
2019-01-29 08:20:21 +00:00
J. Ryan Stinnett 20bf683df8
Merge pull request #2517 from jryans/auth-server-type-selector
Add server type selector and style login flow
2019-01-28 22:11:14 -06:00
J. Ryan Stinnett a6003dc638 Restore SVG indentation 2019-01-28 21:56:18 -06:00
Travis Ralston d34390d230
Merge pull request #2512 from matrix-org/travis/usettings/tab/flair
Implement flair tab in user settings
2019-01-28 20:37:22 -07:00
Travis Ralston 70b34aa2c3 Condense CSS rules and use box-sizing instead of math 2019-01-28 20:26:03 -07:00
J. Ryan Stinnett 7edd99c48c Change matrix.org logo to avoid fonts 2019-01-28 21:19:49 -06:00
J. Ryan Stinnett 34e2979f98 Add Modular server config screen 2019-01-28 17:32:56 -06:00
J. Ryan Stinnett d96e814a92 Add link to edit server details 2019-01-28 16:13:19 -06:00
J. Ryan Stinnett 8e9fc8a8e7 Make existing fields full width 2019-01-28 15:29:36 -06:00
J. Ryan Stinnett 398ded4a91 Switch to two phase login 2019-01-28 14:58:21 -06:00
Travis Ralston ea1d6a0146 Minor styling and avatar bug fixing 2019-01-28 13:54:56 -07:00
Travis Ralston 243feb9b13 Early tab structure and profile changes (name/avatar/topic) 2019-01-28 13:54:56 -07:00
Travis Ralston b7d0dd4408 Rename GeneralSettingsTab to GeneralUserSettingsTab 2019-01-28 13:54:56 -07:00
Travis Ralston c204cd7be3
Merge pull request #2502 from matrix-org/travis/settings/disabled-selects
Override UA/OS styles for disabled Field selects
2019-01-28 10:32:37 -07:00
Travis Ralston 3d59cf996f Icon for flair tab 2019-01-28 10:24:18 -07:00
David Baker 2d61a2508d
Merge pull request #2514 from matrix-org/bwindels/roomlistjslayout-bis
Redesign: new roomlist layout fixes
2019-01-28 15:53:28 +00:00
Bruno Windels 79a44b1bfb always hide overflow on RoomList in case Layout screws up 2019-01-28 16:03:49 +01:00
Bruno Windels 55e0838c82
Merge pull request #2507 from matrix-org/bwindels/roomlistjslayout
Redesign: new layout algorithm for room sublists.
2019-01-28 14:55:31 +00:00
J. Ryan Stinnett abe6fd2f60 Rework `ServerConfig` to approach design
The public server search box is left out for now, so this restyles the existing
custom server inputs to more closely approximate the design.
2019-01-28 08:52:20 -06:00
J. Ryan Stinnett b1f698586e Style SSO login like a button 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett 344a5d1547 Style login type with primary color 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett 7934a2950c Add 'Your account' header 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett 73aeb26a79 Remove dead code for empty `matrixIdText` in `PasswordLogin` 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett 0bee324e48 Add server type selector component 2019-01-28 08:52:20 -06:00
David Baker b4f02844a8 Merge remote-tracking branch 'origin/experimental' into dbkr/sas 2019-01-28 09:36:39 +00:00
Travis Ralston 57e45e7e7c Proof of concept for a flair tab in user settings 2019-01-25 15:35:32 -07:00
Travis Ralston 535d42684f Initial structure for new room settings 2019-01-25 13:09:44 -07:00
Travis Ralston f7f23e4dea Merge branch 'experimental' into travis/usettings/tab/security 2019-01-25 09:12:07 -07:00
Travis Ralston aeac82209e Improve disabled Field styling 2019-01-25 09:10:16 -07:00
Travis Ralston 949343d7d5
Merge pull request #2505 from matrix-org/travis/settings/animated-toggles
Add simple animations to toggle switches
2019-01-25 07:51:38 -07:00
Travis Ralston 3301c35f7d
Merge pull request #2501 from matrix-org/travis/settings/dialog-size
Have the settings dialog be fixed in size
2019-01-25 07:46:36 -07:00