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

1291 Commits

Author SHA1 Message Date
Germain
f87b5ee996
Make entire thread panel tile clickable (#7371) 2021-12-20 13:43:45 -07:00
Michael Telatynski
63e69d9fa8
Fix inline code block nowrap issue (#7406) 2021-12-17 16:41:01 +00:00
Michael Telatynski
818465a4d6
Increase gap between ELS and the subsequent event to prevent overlap (#7391) 2021-12-17 09:28:10 +00:00
Michael Telatynski
d009cebb07
Fix sizing of e2e shield in bubble layout (#7394) 2021-12-16 18:35:51 +00:00
Michael Telatynski
4a9173a7f1
Fix alignment between ELS and Events in bubble layout (#7392) 
* Fix alignment between ELS and Events in bubble layout

* Improve ELS behaviour in bubble layout
 2021-12-16 18:34:59 +00:00
Michael Telatynski
11aa6c7435
Don't show a message bubble around polls (#7374) 
* Don't show a message bubble around polls

* Update res/css/views/rooms/_EventBubbleTile.scss
 2021-12-15 19:47:57 +00:00
Germain
48a37985f5
Allow slash commands description to wrap on a new line (#7370) 2021-12-15 10:16:40 +00:00
Germain
ce570ab827
Hook threads notification state to UI (#7298) 2021-12-13 14:05:42 +00:00
Kim Brose
692679a5ea
don't collapse spaces in inline code blocks (#7328) 2021-12-10 14:50:50 +00:00
Kerry
d7a6e3ec65
Correct tab order in room preview dialog (#7302) 
* tab order

* lint fixes

Signed-off-by: Kerry Archibald <kerrya@element.io>

* test RoomPreviewBar

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add copyright header

Signed-off-by: Kerry Archibald <kerrya@element.io>

* Update src/components/views/rooms/RoomPreviewBar.tsx

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

* fix tabs/spaces lint for reformatted actions

Signed-off-by: Kerry Archibald <kerrya@element.io>

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-12-09 11:48:58 +01:00
Michael Telatynski
4712ae49b2
Fix favourites and people metaspaces not rendering their content (#7315) 2021-12-09 09:43:45 +00:00
Michael Telatynski
f9e3328fb3
Fix issue with room list resizer getting clipped in firefox (#7303) 2021-12-08 09:19:12 +00:00
Michael Telatynski
97ee25126f
Fix favourite & people metaspace issue on Chromium browsers (#7301) 2021-12-07 15:54:30 +00:00
Timo
9bcb82d6dc
Add CSS variable to make the UI gaps consistent and fix the resize handle position (#7234) 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-12-06 13:10:52 +01:00
Matthew Hodgson
1262021417
Simple static location sharing (#7135) 
Adds maplibre as a dependency, and behind a labs flag, lets users send and receive [MSC3488](https://github.com/matrix-org/matrix-doc/blob/matthew/location/proposals/3488-location.md) style location shares - with backwards compatibility with old school `m.location` `msgtype` location shares too.

For this to work, you have to define a valid maptile server and API in your config.json's `map_style_url`.
 2021-12-06 09:45:12 +00:00
Michael Telatynski
4a6d46b76a
Replace breadcrumbs with recently viewed menu (#7073) 2021-12-01 10:50:06 +00:00
Michael Telatynski
8fe582b094
Tweaks to informational architecture 1.1 (#7052) 
* Move user avatar to Space panel

* Add room list header for 'Home' or 'Space Name' to room list
Add existing Space context menus to room list header

* Re-add pending room join spinner

* Iterate RoomListHeader plus context menu

* Iterate space context menu

* Iterate room list + interactions

* Move DND to new iA model

* Replace composer custom status management with usermenu one

* Cull Quick Actions

* Iterate minimized room list state

* delint

* Merge the RoomListNumResults into the RoomListHeader

* Make the search shortcut prompt semi-bold

* Iterate RoomListHeader based on design review

* Iterate UserMenu based on feedback

* Add name to expanded spacepanel usermenu button

* i18n

* Make room sub list aux button components more generic

* Change left panel explore button to only refer to room directory

* Iterate RoomListHeader

* Fix custom user status input field width in Chrome

* Bring back Notification settings button

* delint

* i18n

* post-merge fix

* iterate pr

* Remove unused state

* update copy

* Apply suggestions from PR review

* delint

* Update invite iconography

* Iterate Space context menu to match Figma

* Fix chevron alignment

* Fix edge case for RoomListHeader on metaspaces

* Wire up general rageshake-driven feedback mechanism

* Add IA1.1 info toast

* add missing alt attribute

* delint

* delint

* tweak ia toast priority

* e2e test account for new toast

* autofocus feedback field and remove old subheading

* tweak copy

* Iterate space panel colours to match Figma

* Iterate PR

* delint

* Fix feedback submission with object setting values

* iterate based on review

* Tweak colours and update splash image

* Tweaks based on review

* Remove room list prompt, made redundant by the big fat `+`

* Fix edge cases around User Menu positioning and dnd

* Add missing import, bad merge?

* Update aria label in e2e test

* Fix room list space rooms context menu explore button behaviour

* Tweak copy

* Revert order of options in the UserMenu

* Tweak copy

* i18n
 2021-11-30 18:08:46 +00:00
Šimon Brandner
9db0ebb7f5
Task/colors 11 (#7211) 2021-11-29 12:52:09 +00:00
Germain
3a2aa9d96c
Polish threads misalignments and UI diversion (#7209) 2021-11-29 10:58:34 +00:00
Michael Telatynski
7f350ae0f4
Prevent programmatic scrolling within truncated room sublists (#7191) 2021-11-23 18:39:36 +00:00
Timo
a156ba8be9
Fix video call container size inconsistencies (#7170) 2021-11-23 11:13:51 +01:00
Germain
9e7b407bf7
Add spacing between right panel and main timeline (#7176) 2021-11-22 13:02:48 +00:00
Timo
a65637c1ed
Fix maximise icon size in the pinned apps drawer (#7152) 2021-11-17 12:44:26 +01:00
Šimon Brandner
8f13f3882f
Cleanup E2ePadlock code (#7144) 2021-11-17 09:36:10 +00:00
Germain
1cb0e92768
Remove CSS override for event line on thread view (#7141) 2021-11-17 08:58:32 +00:00
Timo
556cfc7ed8
Add maximise widget functionality (#7098) 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-11-16 15:43:18 +01:00
Šimon Brandner
4eadb3bca1
Color cleanup number 10 (#7132) 2021-11-16 10:10:44 +00:00
Michael Telatynski
27c3153947
Unified room context menus (#7072) 2021-11-15 11:39:25 +00:00
Šimon Brandner
2a1a180ece
Fix hover tile border (#7117) 
* Revert "Update highlighted event line to prevent content jumping (#7090)"

This reverts commit 0f8272c6a1.

* Fix message jumps

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-11-11 14:48:11 +00:00
Šimon Brandner
9abb2f5ff4
Color cleanup 8 (#7108) 
* $accent-color -> $accent

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $accent-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $notice-primary-color -> $alert

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $notice-primary-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $accent-50pct

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $warning-color -> $alert

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $accent-darker

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $orange-warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $warning-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $info-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-11-11 13:37:29 +00:00
Germain
1de9630e44
Fixes following threads design implementation review (#7100) 2021-11-11 11:00:18 +00:00
Šimon Brandner
71d8946641
Color cleanup number 7 (#7094) 
* $reaction-row-button-selected-border-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $reaction-row-button-bg-color -> $header-panel-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $room-warning-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $button-link-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $tab-label-icon-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $tab-label-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $event-redacted-border-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $event-redacted-fg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $panel-divider-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $search-placeholder-color -> #61708b

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $search-bg-color -> #181b21

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $header-panel-border-color -> #000000

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $scrollbar-track-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $eventbubble-avatar-outline -> $background

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-11-10 09:46:33 +00:00
Šimon Brandner
07d9e93d67
Color cleanup number six (#7050) 
* Remove $voip-decline-color and $voip-accept-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $dialog-background-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $mention-user-pill-bg-color -> $warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $plinth-bg-color -> $secondary-accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $input-lighter-fg-color -> $input-darker-fg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $input-valid-border-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $input-invalid-border-color -> $warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $button-bg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $avatar-bg-color -> $background

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $preview-widget-fg-color -> $greyed-fg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $settings-profile-button-fg-color -> $settings-profile-overlay-placeholder-fg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $presence-online -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $pinned-unread-color -> $notice-primary-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $event-highlight-fg-color -> $warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $tab-label-active-bg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $button-primary-bg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $button-danger-bg-color -> $notice-primary-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $button-link-fg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $togglesw-on-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $slider-selection-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $progressbar-fg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $authpage-body-bg-color -> $background

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix merge issue

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix second merge issue

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-11-08 11:50:53 +00:00
Germain
0f8272c6a1
Update highlighted event line to prevent content jumping (#7090) 2021-11-05 14:46:29 +00:00
Germain
aacea8d87b
Fix MemberAvatar rendering and thread info color (#7085) 2021-11-04 17:10:22 +00:00
Andy Balaam
9c8e1d32e2
Rename mx_RadioButton to mx_StyledRadioButton to match class name (#7083) 2021-11-04 12:57:38 +00:00
Germain
38750202ee
Design thread list tiles according to mockups (#7078) 2021-11-03 18:05:01 +00:00
Germain
4b66d4a891
Unbreak IRC layout when thread summary is displayed (#7066) 2021-11-03 08:26:41 +00:00
Germain
0bae79d3c3
Improve Thread View UI (#7063) 2021-11-02 13:18:51 +00:00
Šimon Brandner
5202c0a237
Show a gray shield when encrypted by deleted session (#6119) 2021-11-01 17:28:23 +00:00
Travis Ralston
3f3e4ff674
Don't apply message bubble visual style to media messages (#7040) 
* PSFD-457: Don't apply message bubble visual style to media messages

* Match corner rounding for images
 2021-10-28 08:32:30 -06:00
Travis Ralston
43cbb947b6
PSFD-454: Add padding between controls on edit form in message bubbles (#7039) 
8px arbitrarily to make it not squishy
 2021-10-27 08:17:52 -06:00
Šimon Brandner
5c66bd6c7b
Add max-empty-lines and no-eol-whitespace to stylelint (#7034) 2021-10-26 08:23:23 +01:00
Šimon Brandner
ceb4c7e368
Add insert link button to the format bar (#5879) 2021-10-25 10:56:55 +01:00
Šimon Brandner
1256b1ef2a
Allow scrolling right in reply-quoted code block (#7024) 2021-10-25 10:42:32 +01:00
Šimon Brandner
0ba24ec14f
I shall be murdered by design people for this (#6384) 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-22 21:32:45 -06:00
Germain
35b5109c2a
Fix threads broken layout (#6997) 2021-10-20 18:14:24 +01:00
Travis Ralston
abc5db5715
Fix colour variable references in composer format bar (#7000) 2021-10-20 16:07:31 +00:00
Šimon Brandner
c30029a8b1
Soften border-radius on selected/hovered messages (#6525) 2021-10-20 16:33:23 +01:00
Robin Townsend
2ee732b84d
Update style of composer format bar to match message action bar (#6351) 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-10-20 09:19:54 -06:00
David Baker
01c4d3eede
Fix conflicting CSS on syntax highlighted blocks (#6991) 
Fixes https://github.com/vector-im/element-web/issues/19445
 2021-10-19 18:43:29 +01:00
Germain Souquet
df407ef3a8 Fix EventTileSummary layout for message bubbles 2021-10-19 09:31:28 +01:00
Germain Souquet
9319f07291 Revert "Fix threads with bubbles rendering (#6971)" 
This reverts commit a2bc090607.
 2021-10-19 09:16:40 +01:00
David Baker
98ba3fd6e6
Merge pull request #6973 from matrix-org/dbkr/upgrade_highlightjs 
Upgrade highlight.js
 2021-10-18 19:52:34 +01:00
David Baker
2b7ea16c2d Upgrade highlight.js 
Major version bump for highlight.js. Update usage of deprecated function & some cleanups.
 2021-10-18 19:32:20 +01:00
Germain
77e6e1c0ab
Merge pull request #6960 from matrix-org/gsouquet/rename-replythread 2021-10-18 17:11:31 +01:00
David Baker
e0027895e7
Merge pull request #6963 from SimonBrandner/task/colors-5 
Color clean-up numero cinco
 2021-10-18 17:09:39 +01:00
Dariusz Niemczyk
a2bc090607
Fix threads with bubbles rendering (#6971) 
Fixes https://github.com/vector-im/element-web/issues/18958
 2021-10-18 15:41:05 +01:00
Šimon Brandner
0794be1e98
$notice-secondary-color -> $tertiary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-16 20:21:27 +02:00
Šimon Brandner
ca6ed64811
$roomlist-header-color -> $tertiary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-16 20:21:26 +02:00
Šimon Brandner
79efd61b66
$roomsublist-divider-color -> $primary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-16 20:21:26 +02:00
Šimon Brandner
36531be8ca
$roomtile-preview-color -> $secondary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-16 20:21:26 +02:00
Germain Souquet
5a7c0d87b6 Rename ReplyThread to ReplyChain to avoid confusion with m.thread 2021-10-15 17:42:44 +01:00
Šimon Brandner
0a6e78fd38
Merge remote-tracking branch 'upstream/develop' into task/colors-4 2021-10-15 16:23:40 +02:00
Dariusz Niemczyk
f8c516d927
Add new thread message preview (#18958) (#6953) 
Closes https://github.com/vector-im/element-web/issues/18958
 2021-10-15 14:29:17 +01:00
Šimon Brandner
71eeb836d9
Merge remote-tracking branch 'upstream/develop' into task/colors-4 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-15 15:23:32 +02:00
Travis Ralston
71c5b02390 Add feature flag for polls and placeholder dialog 
We're anticipating development of polls soon, so for efficiency reasons we're getting the labs flag in early. If something goes wrong with the plan, this whole change will be reverted.
 2021-10-12 15:13:56 -06:00
Michael Telatynski
d050c00703 Fix room list skeleton ui for narrow room list 2021-10-12 10:30:36 +01:00
Michael Telatynski
e54d803343 Tweak skeleton UI height to be more reasonable 2021-10-11 10:50:33 +01:00
Germain Souquet
822f73edf7 Remove stale comments in _RoomSublist.scss 2021-10-07 17:28:37 +01:00
Germain
57b919b10a
Delete fixed headerContainer height 
Co-authored-by: Travis Ralston <travisr@matrix.org>
 2021-10-07 16:51:39 +01:00
Germain Souquet
c009d15176 Allow the header container to collapse on itself when room list not minimised 2021-10-07 10:57:23 +01:00
Šimon Brandner
8a9c493f3a
Use correct color for a selected room in the 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-01 20:40:18 +02:00
Germain Souquet
bb7319f632 move timestamp to the right in thread's context 2021-09-24 11:44:11 +01:00
Germain Souquet
dc979a33a1 Fix spacing for message composer buttons 2021-09-22 11:55:25 +01:00
Travis Ralston
30972c597d
Merge pull request #6777 from robintown/room-list-scroll-jumps 
Fix room list scroll jumps
 2021-09-14 13:40:20 -06:00
Travis Ralston
fdb004b4e8
Merge pull request #6785 from robintown/message-bubble-misc 
Fix various message bubble alignment issues
 2021-09-14 13:26:03 -06:00
Travis Ralston
c3ad978941
Merge pull request #6795 from robintown/message-bubble-font-size 
Make message bubble font size consistent
 2021-09-14 13:25:28 -06:00
Robin Townsend
9b3da61ae4 Remove unnecessary unset 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-09-14 12:37:45 -04:00
Robin Townsend
8824b12064 Fix alignment of sender name in message bubble replies 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-09-14 12:35:51 -04:00
Robin Townsend
2c0835ed9b Add comments to message bubble magic numbers 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-09-14 11:27:03 -04:00
Robin Townsend
35171ccd23 Merge branch 'develop' into message-bubble-misc 2021-09-14 11:00:55 -04:00
Dariusz Niemczyk
527e1eb462
Fix autocomplete not having y-scroll 
After changing flex-order the children did not have a max-height which
ended up in the child growing to outside of the screen instead of
being properly constrained.

Fix https://github.com/vector-im/element-web/issues/18997
 2021-09-14 14:45:47 +02:00
Robin Townsend
465ce0820d Make message bubble font size consistent 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-09-13 23:32:01 -04:00
Robin Townsend
8099791b32 Fix various message bubble alignment issues 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-09-11 11:43:36 -04:00
Robin Townsend
07eafb9e3d Fix room list scroll jumps 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-09-09 20:07:51 -04:00
Germain Souquet
aa53444267 Improve narrow composer usability 2021-09-09 13:27:25 +01:00
Germain Souquet
bbf66a0011 Make label clickable on narrow mode context menu 2021-09-07 17:10:09 +01:00
Germain Souquet
646ef197fe Fix PR UI defects 2021-09-07 16:02:26 +01:00
Travis Ralston
329292eb9b
Revert "Revert "Create narrow mode for Composer"" 2021-09-06 22:11:35 -06:00
Travis Ralston
945181fe39
Revert "Create narrow mode for Composer" 2021-09-06 22:08:50 -06:00
Germain
59de3c96a2
Merge pull request #6682 from matrix-org/gsouquet/compact-composer-18533 2021-09-07 05:07:00 +01:00
Germain
e7cfa4816e
Merge pull request #6582 from SimonBrandner/fix/bubble-highlight/18295 2021-09-06 09:56:16 +01:00
Germain Souquet
997f43cb82 Implement new narrow mode UI 2021-09-03 12:03:19 +01:00
Germain Souquet
e416952c90 Merge branch 'develop' into gsouquet/compact-composer-18533 2021-09-02 08:31:29 +01:00
Michael Telatynski
34e9443abc
Merge pull request #6722 from SimonBrandner/fix/autocomplete-dir 2021-09-01 14:45:30 +01:00
Šimon Brandner
4328ee18f5
Show autocomplete sections vertically 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-01 15:37:59 +02:00
Germain
7621a9a0f3
Merge pull request #6658 from matrix-org/gsouquet/threaded-messaging-2349 2021-09-01 08:47:10 +01:00
Šimon Brandner
2d47f453cd
Update styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-26 16:19:46 +02:00
Šimon Brandner
e8bf7ac227
Merge remote-tracking branch 'upstream/develop' into fix/bubble-highlight/18295 2021-08-26 15:40:40 +02:00