upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-25 19:04:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 12
86041 commits 688 branches 1186 tags 7 GiB
Commit graph

178 commits

Author SHA1 Message Date
Ferdinand Thiessen
5088cbc489
chore: Compile assets 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2024-04-10 13:54:32 +02:00
Ferdinand Thiessen
ff1195664b
chore: Compile assets 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2024-04-08 14:35:19 +02:00
Julius Härtl
bebf1e1860
fix: Positioning and active state of viewer components 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2024-03-07 11:10:08 +01:00
Ferdinand Thiessen
cf6a256aec
chore: Compile assets 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2024-02-22 13:57:05 +01:00
Ferdinand Thiessen
6a9daa3fdf
chore: Build CSS from SCSS 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2024-02-20 17:07:04 +01:00
Ferdinand Thiessen
1ddc9b656b
chore: Compile assets 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2024-02-03 14:28:35 +01:00
Ferdinand Thiessen
ae5af1e213
chore: Compile assets 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2024-01-27 01:22:41 +01:00
Ferdinand Thiessen
4f75acab2b
chore: Compile assets 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2024-01-23 02:04:07 +01:00
nextcloud-command
1e699aaf59 chore(deps): fix npm audit 
Signed-off-by: GitHub <noreply@github.com>
 2024-01-22 11:20:03 +00:00
Ferdinand Thiessen
0a568e8a18
chore: Compile assets 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2024-01-19 19:14:05 +01:00
Joas Schilling
f110d3feba
fix(a11y): Fix avatar menu icon color in dark mode 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2024-01-19 10:35:21 +01:00
nextcloud-command
10547706eb chore(assets): Recompile assets 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2024-01-11 21:53:34 +00:00
julia.kirschenheuter
024d29138c Remove unneeded styles: everything is handled by NcVue 
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
 2024-01-03 16:25:41 +01:00
Ferdinand Thiessen
e0946081a6
fix: Adjust focus-visible marker on appmenu 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2023-12-22 02:05:27 +01:00
Ferdinand Thiessen
016afb72a0
chore: Compile assets 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2023-12-14 18:01:00 +01:00
Ferdinand Thiessen
0d6255bafc fix: Update @nextcloud/dialogs to 5.0.3 fixing files copy move 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2023-12-06 12:32:41 +00:00
Joas Schilling
9c0ba1bab9
fix(theming): Fix color inverted icons based on theming and dark mode 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2023-11-29 16:38:41 +01:00
Christopher Ng
a1fcc0341d chore: compile assets 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-11-17 16:42:50 -08:00
Louis Chemineau
c249c56e70
Bump @nextcloud/dialogs to v5.0.1 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2023-11-15 14:11:19 +01:00
Ferdinand Thiessen
b470d33fc7
chore: Update nextcloud dependencies to stable version 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2023-11-09 15:04:00 +01:00
julia.kirschenheuter
dea02d2c32 Fix styles for input field and textarea on focus, hover and active state 
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
 2023-11-07 16:23:56 +01:00
John Molakvoæ
4f4074452d
Fix background removal not applying to user default theming 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2023-10-19 12:01:29 +02:00
Christopher Ng
f8b1d7f4c5
chore: compile assets 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-10-18 08:54:45 +02:00
Christopher Ng
c50c583283 chore: compile assets 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-10-10 15:26:32 -07:00
Simon L
10c0c30ce2 adjust color of focus-visible to be better visible 
Signed-off-by: Simon L <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2023-10-09 15:42:18 +00:00
Christopher Ng
4f1751f51c chore: compile assets 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-10-06 14:43:01 -07:00
julia.kirschenheuter
5d9abce58c Remove unneeded class 
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
 2023-10-02 10:32:04 +02:00
julia.kirschenheuter
5693092053 Split list to navigation for the left sidebar 
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
 2023-09-28 18:18:40 +02:00
dependabot[bot]
02de7ffd78 chore(deps): Bump @nextcloud/dialogs from 5.0.0-beta.2 to 5.0.0-beta.4 
Bumps [@nextcloud/dialogs](https://github.com/nextcloud-libraries/nextcloud-dialogs) from 5.0.0-beta.2 to 5.0.0-beta.4.
- [Release notes](https://github.com/nextcloud-libraries/nextcloud-dialogs/releases)
- [Changelog](https://github.com/nextcloud-libraries/nextcloud-dialogs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud-libraries/nextcloud-dialogs/compare/v5.0.0-beta.2...v5.0.0-beta.4)

---
updated-dependencies:
- dependency-name: "@nextcloud/dialogs"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2023-09-24 14:30:20 +02:00
Ferdinand Thiessen
e7c03aa9c0 chore: Build assets 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2023-08-26 21:01:37 +02:00
Ferdinand Thiessen
3d74ed85ff feat: Add new Vue FilePicker from @nextcloud/dialogs and use it by default. 
Still providing the legacy one until the Vue FilePicker is out of beta.
Pin beta releases so we do not get version conflicts.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2023-08-26 20:55:51 +02:00
Christopher Ng
32f5e0bd96 fix(settings): Keyboard focus outline for app nav button 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-08-21 16:24:55 -07:00
Christopher Ng
266789a4f4 fix(settings): Remove margin on app nav button 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-08-21 16:24:55 -07:00
Christopher Ng
2505961fe7 fix(settings): Remove add group hover border 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-08-21 16:24:55 -07:00
julia.kirschenheuter
34bbb4ed48 Set double outline to buttons in focus state 
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
 2023-07-11 11:22:39 +02:00
Jérôme Herbinet
fb945bc53c npm run sass 
Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>
 2023-06-06 10:04:48 +02:00
Simon L
56aa4c79e2 adjust active element visibility in the sidebar 
Signed-off-by: Simon L <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2023-05-25 18:19:24 +00:00
Ferdinand Thiessen
79239eaded chore: Build compiled assets 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2023-05-16 22:31:10 +02:00
Simon L
3974fece7a disable pull-down-to-refresh for mobile 
Signed-off-by: Simon L <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2023-05-15 20:09:52 +00:00
Simon L
f5e8268ced Use the color-primary-element* variables 
Signed-off-by: Simon L <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2023-05-13 10:15:33 +00:00
John Molakvoæ
9ab7a19b09
fix(theming): remove unnecessary color-primary-element-default-hover variable 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2023-05-04 13:04:15 +02:00
Ferdinand Thiessen
0a0740a5a9 chore: Build css assets 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2023-05-03 19:50:26 +02:00
JL102
f0716abf96 Update autogenerated files 
Signed-off-by: JL102 <jordanlees@mailbox.org>
 2023-04-28 14:02:18 -04:00
Christopher Ng
7dd2c72dea Show modified in filepicker grid 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-04-25 17:21:12 -07:00
Ferdinand Thiessen
f8d558e24f fix(core): Ungroup placeholder css rules to prevent browsers from removing all rules 
When rules are grouped using the comma operator and one selector is invalid / unknown then the whole group is invalidated[1].
In this case `::-ms-input-placeholder` is unknown to Firefox and Chrome, so the `::placeholder` rule is never applied.
[1]: https://www.w3.org/TR/selectors-3/#grouping

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2023-04-17 22:25:03 +00:00
Julius Härtl
389c6dc30b
fix: Fix filepicker breadcrumbs 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2023-04-07 16:04:50 +02:00
Jérôme Herbinet
a64c31148c Fix icons at 16px width and height 
Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>

Fix icon size

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>

npm run sass

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>

Rever + add exception

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>

npm run sass

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>

16px fixed dimentions instead of auto

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>
 2023-04-06 11:44:08 +02:00
julia.kirschenheuter
dc0a95cce0 Adjust breadcrumb navigation structure to the navigation list 
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
 2023-04-04 12:16:45 +02:00
Julius Härtl
4724d1c030
fix: Avoid scrolling the #content wrapper container 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2023-03-28 06:23:26 +02:00
Jérôme Herbinet
da03a5e2e0 npm run sass 
Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>
 2023-03-24 10:27:40 +01:00
Simon L
945bbcb1a4 fix white scrollbar corner in dark mode 
Signed-off-by: Simon L <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2023-03-08 13:30:04 +00:00
Simon L
2715f40e30 fix right-click img tags 
Signed-off-by: Simon L <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2023-03-02 08:58:49 +00:00
Christopher Ng
0a9ce1ff34 Add name for home breadcrumb in filepicker 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-02-24 10:31:06 -08:00
Jonas
c1a82070bd
Don't regard 1024px width viewport as mobile 
Currently we treat 1024px as mobile in some places (e.g. `isMobile` in
nextcloud-vue) and as not mobile yet in others (e.g. in mobile.css).

This commit changes `mobile.scss` to treat viewports smaller than 1024px
as mobile.

This PR accompanies https://github.com/nextcloud/nextcloud-vue/pull/3768

Both are required to fix
https://github.com/nextcloud/nextcloud-vue/issues/3758.

Signed-off-by: Jonas <jonas@freesources.org>
 2023-02-16 12:16:59 +01:00
Christopher Ng
c77998209f Port user menu to Vue 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-02-09 17:54:59 -08:00
John Molakvoæ
9af7ee8d11
Revert "Add alt to the logo, adapt css for logo" 
This reverts commit bba5ab0532.
 2023-01-17 14:19:23 +01:00
Christopher Ng
f6aa5224c4 Focus trap contacts menu with NcHeaderMenu port 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-01-13 23:19:28 +00:00
Christopher Ng
8700730204 Compress SASS output 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-01-11 17:46:32 +00:00
Joas Schilling
a4fec95e57
Fix user status icon in avatar menu 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2023-01-04 11:13:06 +01:00
julia.kirschenheuter
443206965d
Change focused items behavior that neighbor elements (text and border) have no overlapping. 
Add native tooltips to items.

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-12-20 10:21:30 +01:00
Christopher Ng
9012e89431 Fix vue-select styles 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-12-10 01:35:14 +00:00
John Molakvoæ
dcd0878458
Merge pull request #35665 from nextcloud/revert-35165-fix/vue-select-styles 2022-12-08 18:47:29 +01:00
Vincent Petry
26052bf32c
Merge pull request #35660 from nextcloud/enh/a11y-input-border 
Increase default global input field border contrast
 2022-12-08 17:37:45 +01:00
John Molakvoæ
2d5fe7ec23
Revert "Disable style override on vue-select elements" 2022-12-08 11:02:07 +01:00
julia.kirschenheuter
bba5ab0532 Add alt to the logo, adapt css for logo 
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-12-08 09:28:25 +01:00
Christopher Ng
20da75f5ab Increase default input field border contrast 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-12-08 00:28:15 +00:00
Christopher Ng
d3d5034ea4 Disable style override on vue-select elements 
- Disable style override on NcActionButton with `:not(.action-button)`
  due to increased specificity over scoped Vue styles when only
  `:not([class^="vs__"])` is added

Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-12-06 00:19:53 +00:00
dependabot[bot]
06b68e2300 Bump sass from 1.52.1 to 1.56.1 
Bumps [sass](https://github.com/sass/dart-sass) from 1.52.1 to 1.56.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.52.1...1.56.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-12-05 23:06:18 +00:00
Simon L
415e68f53b
Merge pull request #35484 from nextcloud/fix/34653/fix-popover-menu 
fix the popovermenu
 2022-11-30 12:20:47 +01:00
Simon L
366a0dc2cf
Merge pull request #35485 from nextcloud/chore/remove-bootstrap-version-comment 
Remove Bootstrap version reference from tooltip.scss
 2022-11-29 16:32:49 +01:00
Álvaro Brey
79c3970044 Remove Bootstrap version reference from tooltip.scss 
We've had some reports that Nextcloud is using an outdated/deprecated Bootstrap version v3.3.5.

I believe this to be caused by the string "Bootstrap v3.3.5" in the changed line, which after bundling ends up in `core-common.js`, and trips up some security scanners.

It may also be worth investigating why the comments are not getting stripped when bundling the JS.

Signed-off-by: Álvaro Brey <alvaro.brv@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-11-29 14:21:45 +00:00
Simon L
f889007ff2 try to fix the popovermenu 
Signed-off-by: Simon L <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-11-29 12:37:53 +00:00
John Molakvoæ
064fa10ecf
Extract colour from custom background 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-11-29 11:23:05 +01:00
John Molakvoæ
cedae7c6d7
Allow to remove the background and select a custom colour 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-11-29 11:22:13 +01:00
John Molakvoæ
14e0299582
Fix user settings layout 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-11-23 10:47:38 +01:00
John Molakvoæ
e6b7fa6cae
Fix logo invert 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-11-16 09:46:20 +01:00
John Molakvoæ
9cc2f25072
Update @nextcloud/dialogs@ and fix toasts styling 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-11-02 16:31:52 +01:00
Christopher Ng
58abed2059 Invert header icons on bright preset backgrounds 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-10-19 19:12:56 +00:00
John Molakvoæ
d89da9b898
Simplify variable names 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-10-19 12:59:16 +02:00
John Molakvoæ
ef760e0337
Add admin user customization kill switch 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-10-19 12:57:35 +02:00
John Molakvoæ
2d98cd1daf
Add config and fix selenium 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-10-19 10:04:51 +02:00
Joas Schilling
de6c6829bc
Fix avatar menu icons in darkmode 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-10-13 10:11:09 +02:00
Julius Härtl
0c6c535f50
Fix positioning of the public page footer 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2022-10-03 12:33:45 +02:00
nextcloud-command
e7bd935d64 Compile assets 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-09-29 16:07:47 +00:00
John Molakvoæ (skjnldsv)
75bcf9bd2a Remove unwanted settings button background 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-09-28 21:52:21 +00:00
Christopher Ng
295d03869e Fix various theming bugs 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-09-28 17:12:56 +00:00
nextcloud-command
bcddb6fb94 Compile assets 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-09-15 16:59:51 +00:00
Vincent Petry
4f244e95aa
Merge pull request #34065 from nextcloud/bug/noid/main-scrollbar 
Fix scrollbar apperance
 2022-09-15 14:04:34 +02:00
dartcafe
63d51569fe
server.scss 2022-09-15 08:25:10 +02:00
nextcloud-command
4ae7704699 Compile assets 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-09-14 13:12:01 +00:00
nextcloud-command
335964dc15 Compile assets 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-09-13 13:19:54 +00:00
nextcloud-command
203d783c17 Compile assets 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-09-12 16:07:31 +00:00
Carl Schwan
b155adbb51
Fix setting menu height 
- Increase max height to match page height
- Move settings 8px from the right instead of 5px to match other top
  menus
- Handle overflow of the content correctly

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-09-09 13:36:19 +02:00
szaimen
7801550d33 fix files_external settings 
Signed-off-by: szaimen <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-09-09 08:44:08 +00:00
Carl Schwan
af30e7ff5b
Port css to scss 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-09-08 18:24:38 +02:00
Jan C. Borchardt
43616a7b1f
Remove separation borders from contacts menu entries 
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
 2022-09-08 18:24:29 +02:00
Jan C. Borchardt
b0392f4a5c
Contacts menu height adjustment so it shows 4.5 entries 
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
 2022-09-08 18:24:29 +02:00
Jan C. Borchardt
1ade91a551
Contacts menu mail addresses in maxcontrast 
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
 2022-09-08 18:24:28 +02:00
Carl Schwan
58706dd5aa
Merge pull request #33937 from nextcloud/fix/menuitem-radius 
Fix menuitem border radius
 2022-09-08 14:02:37 +02:00
Carl Schwan
ebd96490a5
Fix menuitem border radius 
Fix #33909

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-09-08 10:25:20 +02:00