Commit Graph

1912 Commits

Author SHA1 Message Date
claudiulodro 6b2174b06b Fix indenting and reapply changes 2018-04-17 16:01:19 -07:00
Jeff Stieler dc06bd8f03 Increase width of eWAY logo in OBW. 2018-04-17 16:04:50 -06:00
claudiulodro 6d8946048f Add skip link to recommended step and make skip links darker 2018-04-17 13:55:23 -07:00
Valerie 551db8246e OBW: Add MailChimp to recommended step 2018-04-17 13:51:49 -04:00
Valerie c1e55cd6a5 OBW: Update automated taxes option 2018-04-17 13:51:48 -04:00
Valerie 452491d12d OBW: Update Storefront description and style 2018-04-17 13:51:46 -04:00
Mike Jolley d8814f9381 tip alignment 2018-04-17 12:19:01 +01:00
Mike Jolley 27cf41bbf0 Added personal data cleanup settings 2018-04-17 11:45:24 +01:00
Mike Jolley 5265f03c7b Styling 2018-04-17 11:15:07 +01:00
Mike Jolley 860e7a5d23 Merge branch 'master' into update/gdpr-checkout-customizer 2018-04-16 18:02:28 +01:00
Mike Jolley 1b34cd4745 Moved settings tabs around to allow for privacy page. 2018-04-12 16:59:42 +01:00
Mike Jolley 772588b448 Move WC photoswipe styles to photoswipe.css
Closes #19663
2018-04-10 13:48:05 +01:00
Anwer AR b68e5743e8 Fix for #19600 - Visibility dropdown not responding in Quick Edit when Stock Management is disabled 2018-04-10 05:19:25 +05:00
Mike Jolley 3140a0fb62 More customistion options for terms and conditions. 2018-04-06 11:43:30 +01:00
Mike Jolley 3bf567279b Improve default appearance of descriptions so they toggle on focus and support HTML. 2018-04-05 16:56:00 +01:00
Mike Jolley 3a6c3e002b Add option to choose if the checkout marks either required or optional fields, and style these options. 2018-04-05 14:12:59 +01:00
Tiago Noronha 711e1896f1 Increase orders table checkbox column size on small devices 2018-04-04 23:57:18 +01:00
Claudio Sanches a19685abb1 Removed remaining span.product-type styles 2018-04-03 16:26:01 -03:00
Mike Jolley 5bc26ebd79 Merge branch 'master' into update/17427 2018-04-03 14:38:49 +01:00
Claudio Sanches e718bdd11c
Merge pull request #19192 from nishitlangaliya/Issue-18990
Fixes- Admin - removed product type column
2018-03-28 15:37:57 -03:00
nishitlangaliya b98b17eae8 span.wc-type and span.wc-type::before removed from admin.scss as per suggestion #18990 2018-03-28 23:00:43 +05:30
Mike Jolley 57378785bf Split up state and country fields 2018-03-27 19:32:04 +01:00
Mike Jolley 38c29204d4 Include US in US dollar dropdown so it's searchable 2018-03-27 18:35:15 +01:00
Mike Jolley 5e473cd88f
Merge pull request #19507 from woocommerce/fix/19479
Add missing animation mixin to 2017
2018-03-23 12:49:34 +00:00
Mike Jolley 65f616cc5b Add missing animation mixin to 2017 2018-03-23 12:24:06 +00:00
Alexander Minza 74fdd6f9a7 Force long lines wrapping in the log viewer 2018-03-23 11:18:28 +02:00
Mike Jolley a60e51afe1 Merge branch 'master' into update/setup-wizard-activate-step-when-jetpack-connected 2018-03-14 12:49:44 +00:00
Mike Jolley cb3c4849b4 Merge branch 'master' into fix/19175 2018-03-13 18:14:36 +00:00
Mike Jolley 2f73afcb70 Merge branch 'master' into fix/19152 2018-03-12 17:23:21 +00:00
Mike Jolley d289be327b Merge branch 'master' 2018-03-08 13:24:01 +00:00
Mike Jolley b34e163bd5 No js for all the themes. 2018-03-07 11:44:41 +00:00
Mike Jolley 69b09af0f0 Merge branch 'master' into fix/19175 2018-03-07 10:33:24 +00:00
Mike Jolley 882d009002 Swap underline to hover state 2018-03-05 22:06:51 +00:00
Mike Jolley 88c7c1333b No back links, better link styling 2018-03-05 21:59:32 +00:00
Mike Jolley 1536d50824 Merge branch 'master' into update/18389-wizard-steps-improvements 2018-03-05 20:24:26 +00:00
Mike Jolley 73c85ec38d
Merge pull request #19173 from woocommerce/update/19154
Move jquery ui styles to assets
2018-03-05 18:35:46 +00:00
Mike Jolley 799a87e265 Fix for #19209 and min styles 2018-03-02 16:44:39 +00:00
Mike Jolley bd91ea27ab Update tracker to be opt-in and contain proper instructions
Fixes #19175
2018-03-01 19:31:30 +00:00
Mike Jolley 9b6f3f6f9b Use no-js class to hide JS only forms/content 2018-03-01 15:53:45 +00:00
Mike Jolley dda61aaa2a Outline missing checkbox 2018-02-28 15:42:08 +00:00
Mike Jolley bdb7397dff Leave line height alone for inputs
Fixes #19152

Makes the display more consistent across browsers. Does not seem to
have negative impact.
2018-02-28 14:22:15 +00:00
Mike Jolley b44183b4cb Move jquery ui styles to assets 2018-02-28 13:02:41 +00:00
Mike Jolley c389f4017e Merge branch 'master' into update/19136 2018-02-27 19:11:52 +00:00
Mike Jolley fc9fe996d8 Add profile link to order screen 2018-02-26 18:19:03 +00:00
Mike Jolley 9ed504c4af Add extra data in mobile view 2018-02-23 16:55:06 +00:00
Mike Jolley 5c36c30998
Merge pull request #19035 from woocommerce/fix/19018-wizard-toggles
Setup Wizard: Start toggle when clicking anywhere on row
2018-02-22 12:25:23 +00:00
Mike Jolley fb1d6f7b58 Resolve styling conflict 2018-02-20 16:04:42 +00:00
Caleb Burks 44c5d20c45 Minify/compile 2018-02-19 20:05:58 -05:00
Caleb Burks 8ef278a28b Start toggle on row click 2018-02-19 20:03:32 -05:00
claudiulodro af5cb5df93 Resolve merge conflicts 2018-02-19 10:45:06 -08:00
Mike Jolley dc1097650e Styling 2018-02-19 12:41:42 +00:00
Paul Dechov b8c57576e6 Update graphic to WCS banner design 2018-02-16 18:07:04 -05:00
Remi Corson ad240278bd Do not display H2 note if no note
This will make the note title not appear if no note is defined. However, some CSS styling is needed as padding was originally added via .wc-order-preview-address wichi was containing the note section.
2018-02-16 15:24:31 +01:00
Remi Corson 94802c7a8b Fix #18995
Fixes #18995 by moving the note section outside the addresses container and unlink it from the shipping method conditional statement.
2018-02-16 12:12:15 +01:00
Mike Jolley 65278efd44 Allow modal to be wider and fix button wrapping 2018-02-15 12:46:47 +00:00
Mike Jolley 1b03a80ecb
Merge pull request #18955 from woocommerce/update/3.3-image-handling
Image regeneration and thumbnail improvements
2018-02-14 17:35:53 +00:00
Mike Jolley fe1abb61e6 Fix flex box rules 2018-02-13 20:49:25 +00:00
Mike Jolley e39b6950a8 Notice when regeneration is happening 2018-02-13 12:02:24 +00:00
Caleb Burks 1ce5a034bd Minify 2018-02-10 18:56:09 -05:00
Caleb Burks 19e3126e54 Add additional wizard next steps 2018-02-10 18:51:25 -05:00
Caleb Burks 0b228c4fda Add ability to go back to prev steps during setup 2018-02-10 18:28:07 -05:00
Mike Jolley 5f0460aaa1 Tweak mobile view of order preview
Closes #18900
2018-02-09 14:45:50 +00:00
Caleb Burks 1869042342 Minify 2018-02-08 11:55:53 -05:00
Caleb Burks 454c226778 Use wc_help_tip() 2018-02-08 11:52:32 -05:00
Mike Jolley b95812d563 Handle quick edit 2018-02-08 12:35:57 +00:00
Caleb Burks 0ed97d26bd Compile and Minify 2018-02-07 19:30:09 -05:00
Caleb Burks 4ca94e8f21 Add tooltip for default category 2018-02-07 19:24:43 -05:00
Mike Jolley 079bb0c2a1 Merge branch 'master' into fix/18797 2018-02-05 15:25:08 +00:00
Mike Jolley 107f6e86ed Fix link button styling 2018-02-05 15:00:02 +00:00
Mike Jolley 00c43e76c1 Tweak customer text 2018-02-05 14:47:12 +00:00
Mike Jolley b46ce1c366
Merge pull request #18796 from woocommerce/fix/18795-coupon-editing
Allow removing coupons on editable orders only
2018-02-05 11:23:03 +00:00
Caleb Burks 5c2f90905f Compile & Minify 2018-02-02 22:19:24 -05:00
Caleb Burks 9c3611624c Remove extra CSS padding 2018-02-02 22:19:07 -05:00
claudiulodro e72ce75aef More specificity on smallscreen style override 2018-02-02 11:19:31 -08:00
Claudio Sanches 9c39dd34cc Merge branch 'feature/network-order-widget' of https://github.com/cmmarslender/woocommerce into cmmarslender-feature/network-order-widget 2018-02-02 14:46:51 -02:00
Mike Jolley 653295b60f Tweak default order number width 2018-02-01 20:43:20 +00:00
Mike Jolley 832d767a83 Full support for sorting 2018-01-31 20:17:06 +00:00
Mike Jolley c9aff28aed Merge branch 'master' into fix/18704 2018-01-31 18:04:14 +00:00
Mike Jolley f1dbb70f6e Fix styling if tr is not linked 2018-01-31 18:03:34 +00:00
Mike Jolley 1c570759ae Allow devs to add 'no-link' class to elements to prevent order view link being triggered on row click
Closes #18704
2018-01-31 14:10:23 +00:00
Mike Jolley 6f6ddf2eeb Prevent uncategorized from being sorted. it's always top of the list. 2018-01-31 13:34:55 +00:00
Mike Jolley 341dfe1e7b Fix table styling in mobile 2018-01-30 13:24:59 +00:00
Paul Dechov a2863156cc Tweak shipping service inner spacing 2018-01-25 01:03:52 -05:00
Paul Dechov 9f5f301aa4 Restore sizing of shipping service description 2018-01-25 00:39:23 -05:00
Paul Dechov d4a8ef4da1 Align payment service setting checkboxes to top of their labels rather than bottom 2018-01-24 17:24:07 -05:00
Paul Dechov eff0b62391 Tweak shipping service styles towards original static design 2018-01-24 17:23:28 -05:00
Paul Dechov 25373cadee Tweak spacing of store setup step towards original static design 2018-01-24 17:21:04 -05:00
Paul Dechov b8384aa4a3 Scope service name styles to avoid unintended sizing and positioning 2018-01-24 14:02:09 -05:00
Paul Dechov 5cc6a589ab Make step navigation take up full width, even if there are fewer than 5 2018-01-24 10:29:44 -05:00
Paul Dechov 6dfcdab1bc Remove margin before service settings, as margin now follows content above 2018-01-23 18:23:46 -05:00
Mike Jolley b9a4a342e6 Remove the lone price/label/quantity class in grouped template
Closes #18542
2018-01-22 14:27:46 +00:00
Claudiu Lodromanean 62c4cbb0c8
Merge pull request #18487 from woocommerce/fix/18476
Fix tab corner offset
2018-01-19 13:33:35 -08:00
Mike Jolley 2e88b98068 border box to fix 2012 2018-01-19 16:16:56 +00:00
Mike Jolley 01cb238adb Move customer CSS rule below System.
CSS needs minifying before release
2018-01-18 16:54:22 +00:00
Beka Rice e270609e33 Fix: handle long status names in order modal 2018-01-17 16:28:59 -05:00
ragulka 2a2418e222 tweak grouped action button margins 2018-01-16 12:15:04 +02:00
Mike Jolley 8f6152c7e2 Fix tab corner offset 2018-01-15 15:36:51 +00:00
ragulka a8d8d7d27c gracefully handle overly long order statuses 2018-01-15 16:55:26 +02:00
Mike Jolley 243c664030 Wording update 2018-01-12 12:29:22 +00:00
Christian 641d564b1d
fix word-wrap rule in WC order preview
Fix issue #18392
2018-01-09 11:52:28 +01:00
claudiulodro b5271064c2 Resolve conflicts 2018-01-05 10:47:27 -08:00
claudiulodro fd18d24ddd Recompile and version for beta 2 2018-01-05 10:10:17 -08:00
Mike Jolley 856528d529
Merge pull request #18277 from woocommerce/fix/18276
Change sanitize function in product sales report filter box
2018-01-05 14:59:40 +00:00
Mike Jolley 14afff129c Add appropriate column widths and fix up price method for consistentcy. 2018-01-05 12:23:08 +00:00
Claudiu Lodromanean 06c37ae772
Merge pull request #18340 from ElectricFeet/patch-1
Remove non-standard outdated CSS
2018-01-03 11:23:35 -08:00
Claudiu Lodromanean 79fe38a0ad
Merge pull request #18341 from ElectricFeet/patch-2
Remove non-standard outdated CSS
2018-01-03 11:21:38 -08:00
Claudiu Lodromanean 35ca53da2f
Merge pull request #18343 from ElectricFeet/patch-4
Remove non-standard outdated CSS
2018-01-03 11:20:43 -08:00
Claudiu Lodromanean 61efa103ef
Merge pull request #18344 from ElectricFeet/patch-5
Remove non-standard outdated CSS
2018-01-03 11:20:13 -08:00
Claudiu Lodromanean f91b4757e4
Merge pull request #18345 from ElectricFeet/patch-6
Remove non-standard outdated CSS
2018-01-03 11:19:43 -08:00
Claudiu Lodromanean 41461c8a89
Merge pull request #18346 from ElectricFeet/patch-7
Remove non-standard outdated CSS
2018-01-03 11:15:05 -08:00
claudiulodro d2618c2330 Merge remote-tracking branch 'origin/master' into HEAD 2018-01-03 10:13:23 -08:00
claudiulodro 646caf5753 Tweaks for variation reports 2018-01-03 10:09:53 -08:00
Claudiu Lodromanean 14c2180928
Merge pull request #18279 from woocommerce/fix/setup-wizard-service-style-tweak
Setup wizard: adjust styling for service child elements
2018-01-03 09:38:28 -08:00
ElectricFeet cd2130972f
Remove non-standard outdated CSS
Removed `-moz-osx-font-smoothing: grayscale;` and `-webkit-font-smoothing: antialiased;`, as suggested in woocommerce/storefront#698
2018-01-03 18:10:21 +01:00
ElectricFeet 030fc9dcca
Remove non-standard outdated CSS
Removing `-moz-osx-font-smoothing: grayscale;` and `-webkit-font-smoothing: antialiased;`, as suggested in woocommerce/storefront#698 and came across this one too. "auto" seems to be invalid, in any case...
2018-01-03 18:07:38 +01:00
ElectricFeet fa68a71adf
Remove non-standard outdated CSS
Removed `-moz-osx-font-smoothing: grayscale;` and `-webkit-font-smoothing: antialiased;`, as suggested in woocommerce/storefront#698
2018-01-03 18:01:10 +01:00
ElectricFeet 480b83447d
Remove non-standard outdated CSS
Removed `-moz-osx-font-smoothing: grayscale;` and `-webkit-font-smoothing: antialiased;`, as suggested in woocommerce/storefront#698
2018-01-03 17:59:50 +01:00
ElectricFeet c4e87e0c3b
Remove non-standard outdated CSS
Removed `-moz-osx-font-smoothing: grayscale;` and `-webkit-font-smoothing: antialiased;`, as suggested in woocommerce/storefront#698
2018-01-03 17:56:44 +01:00
ElectricFeet 2ee9f9b034
Remove non-standard outdated CSS
Removed `-moz-osx-font-smoothing: grayscale;` and `-webkit-font-smoothing: antialiased;`, as suggested in woocommerce/storefront#698
2018-01-03 17:54:46 +01:00
Paul Dechov e03f0c201f Align service name logos to top, and adjust padding 2018-01-03 10:43:26 -05:00
Claudiu Lodromanean de71c92fa0
Merge pull request #18278 from woocommerce/fix/setup-wizard-ppec-api-subject-set-when-unchecked
Setup wizard: don't set PPEC "API Subject" when WCS rerouting is unchecked
2018-01-02 10:39:35 -08:00
Mike Jolley 4e87f952f7 Fix scroll bar appearance with overflow hidden
Closes #18289
2018-01-02 13:50:35 +00:00
Paul Dechov 6824b2a923
Merge branch 'master' into fix/setup-wizard-service-style-tweak 2017-12-29 13:02:19 -05:00
Paul Dechov a87183503f Fix api_subject option being set even when reroute_requests unchecked 2017-12-22 14:57:50 -05:00
Mike Jolley 99fb55144f Improve default select2 styles 2017-12-14 16:37:51 +00:00
Paul Dechov 7e45159393 Set max-heights for service child elements 2017-12-13 12:34:56 -05:00
Mike Jolley 71c9025709 Updates CSS for chevron to work across browsers - input::before is not supported in Firefox. 2017-12-13 14:30:00 +00:00
claudiulodro a10dbbde48 Recompile everything 2017-12-12 11:38:44 -08:00
claudiulodro ba363b6353 Bring up-to-date with master and resolve conflicts 2017-12-11 11:36:00 -08:00
Claudiu Lodromanean c0e0f9c2cb
Merge pull request #18039 from woocommerce/add/setup-wizard-wcs-paypal-express-checkout-settings
Setup wizard: PayPal Express Checkout settings for rerouting via WCS
2017-12-11 08:26:24 -08:00
Mike Jolley 8e02bec1e9 Set max width 2017-12-08 16:10:52 +00:00
Mike Jolley c43f7eb014 Featured page styling 2017-12-08 13:32:45 +00:00
Mike Jolley d0db71c6c2 Flex grid for extension list 2017-12-08 13:23:08 +00:00
Mike Jolley 2cadd82cb3 Min 2017-12-08 12:04:10 +00:00
Mike Jolley b6bc0d09a1 Fix select box styling in firefox
Closes #18070
2017-12-08 12:04:04 +00:00
Jonathan Belcher f4d6b6f68f Merge Commit 2017-12-07 12:10:00 -05:00
Jonathan Belcher 885f869d40 Merge commit 2017-12-07 12:02:55 -05:00
Jonathan Belcher 937cdbf230 Merge commit 2017-12-07 11:50:42 -05:00
Jonathan Belcher a2743e6d25 Rebuild CSS 2017-12-06 12:08:28 -05:00
Jonathan Belcher c43f4c65be Merge Commit 2017-12-06 12:07:27 -05:00
Marcin Bot 0d12b31a13 Updated the Klarna logo 2017-12-06 14:04:28 +00:00
Paul Dechov 75afcd26be Tweak sizing and spacing towards design 2017-12-05 19:55:43 -05:00
Paul Dechov 6500b11db8 Adjust logo widths to match design and approximately equalize prominence 2017-12-05 19:55:43 -05:00
Paul Dechov d3c09a9ee5 Extend stripe setting styles to ppec 2017-12-05 14:57:43 -05:00
Marcin Bot 399e2893e1 Updated the Klarna logo 2017-12-05 17:06:35 +00:00
Marcin Bot 17ef8a68f0 Reverted the minified css files 2017-12-05 16:20:15 +00:00
Marcin Bot 4229e2652a Added a new Square logo 2017-12-05 16:20:15 +00:00
Valerie e28341a9a3 Wizard: Ask user if selling in person 2017-12-05 16:20:15 +00:00
Valerie 6d2ca0fd15 Add Klarna to wizard payment step 2017-12-05 16:20:15 +00:00
Jonathan Belcher f05ed543fa Fix css and add search query header 2017-12-05 11:15:09 -05:00
Jonathan Belcher 9f5ab72467 Build CSS 2017-12-05 10:17:28 -05:00
Jonathan Belcher 2c12dcfacd Merge Commit 2017-12-05 10:16:28 -05:00
claudiulodro d60456cc73 Resolve conflicts and bring up to date with master 2017-12-04 13:56:59 -08:00
Mike Jolley 0a9485c465 Merge branch 'master' into feature/11259
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	includes/admin/list-tables/class-wc-admin-list-table-products.php
#	includes/class-wc-install.php
#	includes/wc-update-functions.php
2017-12-04 14:14:03 +00:00
Mike Jolley d8921de735 min 2017-12-04 13:45:52 +00:00
Jonathan Belcher 2d6638a156 Small css fix with margins 2017-11-29 14:48:58 -05:00
Jonathan Belcher 76dba4f022 Add compiled assets 2017-11-29 14:38:41 -05:00
Jonathan Belcher 3d86535c6d Adds geo and install plugin control to extensions featured page 2017-11-29 12:41:08 -05:00
Jonathan Belcher 42ea98a23d Add build asset 2017-11-28 17:04:09 -05:00
Jonathan Belcher 06ee7026aa Fix css on search bar 2017-11-28 15:42:11 -05:00
Jonathan Belcher 2cd514ccb6 Clean up search bar spacing 2017-11-27 16:23:03 -05:00
Jonathan Belcher a549133a2e [WIP] Adds search functionality to extensions page 2017-11-27 16:11:55 -05:00
Mike Jolley 29fed057af Mobile styling 2017-11-22 16:28:11 +00:00
Mike Jolley b3e7260c95 Improve styling of order actions columns 2017-11-22 16:14:30 +00:00
Mike Jolley 98bebd14f2 Hooks for columns and preview list tables 2017-11-21 16:22:43 +00:00
Mike Jolley 2aeaf59f5c Update image loading path 2017-11-21 15:05:08 +00:00
Mike Jolley 830ef8ed73 Change status action buttons 2017-11-20 22:43:37 +00:00
claudiulodro 7892352ea5 Style backorder status mark 2017-11-20 11:39:37 -08:00
Mike Jolley ba7e14322b Missing border 2017-11-20 17:25:55 +00:00
Mike Jolley 812e8928a1 Add methods back to billing/shipping columns 2017-11-20 17:06:08 +00:00
Mike Jolley d74d79471f Don't hide columns based on view width 2017-11-20 15:51:25 +00:00
Chris Marslender 81d1136169
Avoid core list class, so that small screen styling doesn't break 2017-11-17 17:06:24 -07:00
Chris Marslender 41493f66ab
Match list table styling in the widget stylesheet 2017-11-17 16:51:17 -07:00
Chris Marslender 24e9811cbd
Move network order styles to their own file, and load this with the widget 2017-11-17 16:44:17 -07:00
Chris Marslender 0c981767b2
Cursor default on the table rows except for clickable areas 2017-11-17 15:50:44 -07:00
Chris Marslender 34f906944e
Fix alignment/styling issues with the table 2017-11-17 15:49:07 -07:00
Chris Marslender 961c24e373
Merge branch 'master' into feature/network-order-widget 2017-11-15 18:43:34 -07:00
Mike Jolley cbc16f7e2b Min 2017-11-15 14:34:42 +00:00
Mike Jolley 56d86aee96 trashed styling 2017-11-15 13:41:20 +00:00
Mike Jolley 128b826791 Merge branch 'master' into tweak/order-screens
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	includes/admin/class-wc-admin-post-types.php
2017-11-15 13:36:13 +00:00
Mike Jolley 4b3f8817cf Responsive styles 2017-11-15 13:30:39 +00:00
Mike Jolley dea454c88e Clickable elements 2017-11-15 12:51:14 +00:00
Mike Jolley e0bb7b35fd Cursors 2017-11-15 12:35:41 +00:00
Mike Jolley 4bb7bcd3af Fix sorting position 2017-11-15 12:32:02 +00:00
Chris Marslender f1fe210dba
Merge branch 'master' into feature/network-order-widget 2017-11-14 18:52:18 -07:00
Mike Jolley 79d918d33e Merge branch 'feature/unsupported-theme' into update/move-settings-to-customizer-17148
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	assets/css/woocommerce-rtl.css
#	assets/css/woocommerce.css
2017-11-14 16:02:02 +00:00
Mike Jolley bc16a85d22 Cropping settings 2017-11-14 16:01:36 +00:00
claudiulodro 074f9b76b0 Fix init bug and remove nowrap from buttons 2017-11-13 11:56:24 -08:00
Mike Jolley 04d8184496 More filter options 2017-11-13 19:03:08 +00:00
claudiulodro 8e0e0e8747 Cleanup and integrate styles into main stylesheet 2017-11-13 10:08:46 -08:00
claudiulodro 2609a4cd30 Bring up-to-date with feature branch 2017-11-10 10:43:15 -08:00
Mike Jolley 1d93d8f577 Columns styling 2017-11-10 17:50:56 +00:00
claudiulodro 7f37e445b6 Use shortcode-based product page on unsupported themes 2017-11-09 10:47:20 -08:00
James Koster b20a43fa1e image preview styling 2017-11-08 17:29:28 +00:00
Mike Jolley be3b37f1df Adjust preview position 2017-11-08 13:36:17 +00:00
Mike Jolley e025caf177 Widths and aspect ratios 2017-11-07 18:32:43 +00:00
Mike Jolley 5a3c9121d1 2010 support 2017-11-07 12:11:22 +00:00
Chris Marslender 77721a1637
When a user can't access any sites, or no orders are returned, show "no orders found" message 2017-11-06 10:44:55 -07:00
Chris Marslender 68e42ab6a2
Add loading indicator for the network order widget 2017-11-06 10:32:30 -07:00
Mike Jolley 8f37ea33ed Refactored into list table classes 2017-11-03 16:10:32 +00:00
Mike Jolley ed49c5b524 Styling improvements 2017-11-03 11:57:44 +00:00
Mike Jolley 1f7ecd9fb9 Merge branch 'master' into tweak/order-screens
# Conflicts:
#	assets/js/frontend/checkout.min.js
2017-11-01 16:52:21 +00:00
Mike Jolley 3e7eb3f8fe Style errors in iris picker 2017-11-01 13:47:13 +00:00
Mike Jolley cb087a0755 fix tests and minify css 2017-10-31 12:26:59 +00:00
Mike Jolley 43ba326ed9 Fix currency position with rtl symbols 2017-10-31 12:22:18 +00:00
claudiulodro 4ebac67545 Scroll plugins list if it's too big 2017-10-16 09:10:20 -07:00
Mike Jolley d6cf486c55 Add a basic screen-reader-text style for themes which do not define it. 2017-10-13 11:27:20 +01:00
Mike Jolley ce47fa65c2 Changelog + grunt 2017-10-11 10:50:39 +01:00
Mike Jolley 6b357bcfdc Updates the payment step copy and fixes margins 2017-10-10 15:40:03 +01:00
Valerie K b4088c5d91 Wizard: Handle Jetpack install, activate, and connection errors (#16983)
* Wizard: Remove extra query arg in next step URL

Remove the activate_error query arg from
the URL for the next step.

* Wizard: Remove temp queued Jetpack install option

This is done so that the option does not remain
when going through the wizard again, or when going
back to previous pages.

It prevents an infinite loop from happening when
waiting for the Jetpack install and activation
to finish on the activate step.

* Wizard: Install and activate Jetpack if needed

Add function to install & activate Jetpack as needed.
Props to @jeffstieler for the idea, and the implementation/code:
https://github.com/Automattic/woocommerce-services/pull/1031#discussion_r122505316
https://github.com/Automattic/jetpack/blob/master/3rd-party/woocommerce-services.php#L101

Add a list of errors and a function to get the correct error message.

After clicking the connect Jetpack button, make sure that
Jetpack is installed and activated.

On error, redirect to the activate page with a query arg.

* Wizard: Show Jetpack error message if it exists

Always check for an error message when displaying
the activate step. If the error
message exists, display it at the top of the page.

* Remove redundant "if" so the $title in the Activate step is always a valid string

* Tweaked the "Server is on a private network" Jetpack activation error message.
2017-10-05 12:51:49 +01:00
Valerie K 61caed9cb8 Wizard: Add Stripe Email (#17029)
* Wizard: Add Stripe email input, show previously entered payment settings, only save settings for enabled gateways
2017-10-04 13:37:59 -06:00
Jeff Stieler 0150b4dd8e Regenerate wizard CSS. 2017-10-03 12:13:08 -06:00
Marcin Bot 57af1bf804 Reverted compiled rtl and css of the files outside #17008 2017-10-03 17:57:00 +02:00
Valerie 49246206a5 Wizard: Update compiled CSS 2017-10-03 17:38:08 +02:00
Valerie 450236c8d9 Wizard: Update store setup text 2017-10-03 17:30:00 +02:00
Valerie 9da7925288 Wizard: Fix paragraph bottom margin
Avoid too little bottom margin when the paragraph
is the last paragraph on the page, but not the last element.

Avoid too much bottom margin when there were nonce fields
after the last paragraph on the page.
2017-10-03 17:29:22 +02:00
Valerie 9a2ab72cd6 Wizard: Style tracking option 2017-10-03 17:26:32 +02:00
Ola Olusoga 231b9e7c2c adding rtl & css
Adding css and rtl to PR
2017-10-02 17:04:30 -04:00
Ola Olusoga 0894abf37d Small style adjusts to onboarding
Made WooCommere logo smaller, and adjusted padding, weights, e.t.c.
Minor tweaks.
2017-10-02 16:39:12 -04:00
claudiulodro a5c2ebb2f2 Bring up-to-date with master and recompile css 2017-09-27 13:32:09 -07:00
Valerie 72f9ce08ac Wizard: Move Jetpack TOS above button 2017-09-27 22:48:33 +03:00
Valerie d45ae38770 Wizard: Avoid too much space after last paragraph 2017-09-27 17:53:03 +03:00
Valerie 994480c3ca Wizard: Consolidate button styles in one rule 2017-09-27 17:52:53 +03:00
Valerie 562f37520d Wizard: Fix logo placement in services list 2017-09-27 17:11:10 +03:00
Valerie 263a471c40 Wizard: Fix chevron placement in toggle list 2017-09-27 17:08:47 +03:00
Mike Jolley 9800d72c82 Merge pull request #16949 from woocommerce/fix/16928
[Importer] Display error message when it's impossible to get a sample of the file
2017-09-27 13:01:20 +01:00
José Marques 12a399b529 Helper: removes blue text shadow from CTA on disconnect account screen 2017-09-27 11:09:57 +01:00
Valerie f183344a9c Wizard: Style footnote on last page 2017-09-26 15:10:30 -06:00
Valerie 83d7b03883 Wizard: Style next actions section 2017-09-26 15:10:29 -06:00
Valerie 2348faf9e5 Wizard: style newsletter form 2017-09-26 15:10:29 -06:00
Valerie 5a7db686c5 Wizard: Add placeholder to flat rate cost input 2017-09-26 15:10:29 -06:00
Valerie aee55f4b68 Wizard: Style shipping method selection 2017-09-26 15:10:29 -06:00
Valerie 17a97ca3f7 Wizard: Remove inline CSS for unit dropdowns 2017-09-26 15:10:28 -06:00
Valerie 4be979f322 Setup wizard: Style email input for payment service 2017-09-26 15:10:28 -06:00
Valerie 1dadabaa56 Setup wizard: Style store info form 2017-09-26 15:10:28 -06:00
Valerie 14bb189c8a Setup wizard: Update page padding 2017-09-26 15:10:28 -06:00
Valerie 244296b814 Setup wizard: Update button style 2017-09-26 15:10:27 -06:00
Valerie 426c0c2743 Setup wizard: Style Jetpack logo 2017-09-26 15:10:27 -06:00
Valerie 24e3db78ec Setup wizard: Style Jetpack feature sections 2017-09-26 15:10:27 -06:00
Valerie 0f04645bea Setup wizard: Show correct shipping text on select 2017-09-26 15:10:27 -06:00
Valerie 1960b6bcd1 Setup wizard: Fix thick border in toggle list 2017-09-26 15:10:27 -06:00
Valerie 18deb4dc2e Setup wizard: Style shipping unit selection 2017-09-26 15:10:26 -06:00
Valerie fc5aa77259 Setup wizard: Style shipping method description 2017-09-26 15:10:26 -06:00
Valerie 3645435e17 Setup wizard: Fix extra padding in name column 2017-09-26 15:10:26 -06:00
Valerie ad5709d3b5 Setup wizard: Add shipping list header 2017-09-26 15:10:26 -06:00
Jeff Stieler e6dc95432a Setup wizard: hide settings until a service is enabled. 2017-09-26 15:10:23 -06:00
Valerie d9e4092281 Setup wizard: Fix list toggle name color 2017-09-26 15:09:36 -06:00
Valerie e23aefef13 Setup wizard: Add toggle for manual payment list 2017-09-26 15:09:10 -06:00
Valerie 1eda1a026d Setup wizard: Add function to display service rows
- Update style
- Use new reusable class 'wc-wizard-services' instead of
'wc-wizard-payment-gateways'
- Update JS script for toggling checkboxes
- Update payment gateways: in-cart and manual
- Update POST variable names in save function
2017-09-26 15:08:31 -06:00
Claudio Sanches 0c6392eeef Display error message when it's impossible to get a sample of the file.
When the file is empty or using an incorrect charset will display just an empty screen, since we output errors before check if the file is valid.

I included the error output inside the mapping step in order to fix this issue, and added a new option to display buttons after the error  message.

Closes #16928
2017-09-26 17:48:37 -03:00
Mike Jolley 71890624d7 Include loader mixin in 2017 theme
Closes #16921
2017-09-25 14:52:29 +01:00
Mike Jolley c0f5fbd5fc Leave width for nested inputs 2017-09-08 12:27:16 +01:00
Mike Jolley 4d1f636bc3 Merge pull request #16716 from woocommerce/fix/helper-mobile-filter
Helper: fix counter indicator in subscriptions filter
2017-09-06 10:47:05 +01:00
José Marques eec2bb1a1a Helper: fix counter indicator in subscriptions filter 2017-09-05 17:33:10 +01:00
Umangvaghela 9bed39018d Fix CSS changes 2017-09-05 17:30:43 +05:30
Mike Jolley 1fb572f9ee Remove columns 2017-09-04 18:05:34 +01:00
Mike Jolley 2a71a66fc9 Order screen refinements and preview window 2017-09-04 17:42:31 +01:00
Mike Jolley d58a09e76a Merge branch 'master' into helper-updates
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
2017-08-30 21:22:48 +01:00
Jonathan Belcher b898cd5a98 Correct CSS to show notifcation count 2017-08-30 15:26:46 -04:00
Mike Jolley fce69c3dad Fix status page padding 2017-08-30 15:39:54 +01:00
José Marques bb7691255d Helper: adds styles for update counter 2017-08-29 10:53:48 +01:00
José Marques 0585df9fe3 Helper: additional styles for subscription filter 2017-08-29 10:11:47 +01:00
Mike Jolley 23ca228a40 Fix input width, Closes #16571 2017-08-23 10:55:00 +01:00
Mike Jolley d68291b3ac Merge pull request #16086 from woocommerce/improvement/versions
Extensions version check.
2017-08-21 18:18:04 +01:00
Mike Jolley b20ef5dcac Styling 2017-08-21 15:53:08 +01:00
Mike Jolley 0dc1754b91 Merge branch 'master' into update/store-owner-newsletter
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	assets/css/twenty-seventeen-rtl.css
#	assets/css/twenty-seventeen.css
#	assets/css/woocommerce-rtl.css
#	assets/css/woocommerce.css
2017-08-18 18:21:55 +01:00
Mike Jolley 8720bde2f3 Minify 2017-08-18 10:39:45 +01:00
Mike Jolley 1efdb64b10 Remove css and js 2017-08-18 10:39:29 +01:00
James Koster a2740cf7a5 Fix disappearing image when zoomed on touch devices 2017-08-16 10:20:14 +01:00
Mike Jolley a44a57b5d9 Improve tools page styling 2017-08-15 12:05:34 +01:00
claudiulodro ae80d12d80 Merge master 2017-08-14 11:12:09 -07:00
Rami Yushuvaev f12ac58932 Remove redundant CSS
The `nav.woo-nav-tab-wrapper` CSS rule overrides WordPress core rule with the same CSS.

We can remove that from WooCommerce.
2017-08-13 22:38:54 +03:00
Mike Jolley b6fc6817be Icon alignment 2017-08-11 17:58:26 +01:00
Mike Jolley fc0d729034 Remove figure margin/padding css
Closes #16396
2017-08-11 10:49:52 +01:00
claudiulodro 9e70a74857 Styling 2017-08-10 13:29:32 -07:00
Mike Jolley 3dc9f06f6a Remove fixed discounts correctly 2017-08-10 12:06:03 +01:00
claudiulodro a416ebe09b It kind-of works. 2017-08-09 14:55:35 -07:00
Mike Jolley c556facd41 Fix percent coupon and display 2017-08-09 19:02:10 +01:00
Mike Jolley 140771e759 Merge branch 'master' into improvement/versions
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	assets/css/helper-rtl.css
#	assets/css/helper.css
#	assets/css/twenty-seventeen-rtl.css
#	assets/css/twenty-seventeen.css
#	assets/css/wc-setup-rtl.css
#	assets/css/wc-setup.css
2017-08-09 10:08:06 +01:00
Mike Jolley 86a225a8d9 Newsletter signup 2017-08-08 18:00:47 +01:00
Mike Jolley e82ca1c1a6 Styling and unknown plugin detection 2017-08-08 17:12:50 +01:00
claudiulodro d07ececd3f Fix dark theme readability 2017-08-02 08:41:53 -07:00
Mike Jolley 5642ee0c4d Only check active plugins 2017-07-17 19:35:14 +01:00
Mike Jolley 0b606c8bbe Styling and code tidy 2017-07-17 19:30:21 +01:00
Mike Jolley 8c17027eb6 Merge branch 'master' into improvement/versions
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	assets/css/helper-rtl.css
#	assets/css/helper.css
#	assets/css/twenty-seventeen-rtl.css
#	assets/css/twenty-seventeen.css
#	assets/css/wc-setup-rtl.css
#	assets/css/wc-setup.css
#	assets/css/woocommerce-rtl.css
#	assets/css/woocommerce.css
2017-07-17 18:04:28 +01:00
claudiulodro 35c4c7fbe6 v2 2017-07-14 13:47:29 -07:00
claudiulodro 129763dadf Split up notices 2017-07-14 12:44:16 -07:00
claudiulodro 40198bf2c8 Modal beta 2017-07-13 15:38:12 -07:00
claudiulodro 20ebe8c193 Modal 2017-07-13 12:47:13 -07:00
Mike Jolley 37fc4c8f77 Ajaxify the product category filter (#16110)
* Ajaxify the product category filter

Closes #12773

* Min
2017-07-13 17:04:40 +01:00
Claudiu Lodromanean 287b0107b1 Merge pull request #16109 from woocommerce/fix/15858
add next button to pointers and allow it to be dismissed
2017-07-13 08:45:49 -07:00
Claudiu Lodromanean 268166ecd0 Merge pull request #16093 from woocommerce/fix/15824
Fix select box styling in 2017
2017-07-13 08:28:51 -07:00
Mike Jolley 9d6bcfc6c2 Dark styles 2017-07-13 14:56:07 +01:00
Mike Jolley d63cf8c52f add next button to pointers and allow it to be dismissed
Closes #15858
2017-07-13 13:09:52 +01:00
claudiulodro b355e016cd Do notice in a pop-up 2017-07-12 12:38:19 -07:00
Mike Jolley fdcf16bb60 Merge branch 'master' into update/15563
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	assets/css/helper-rtl.css
#	assets/css/helper.css
#	assets/css/wc-setup-rtl.css
#	assets/css/wc-setup.css
#	assets/css/woocommerce-rtl.css
#	assets/css/woocommerce.css
2017-07-12 16:18:13 +01:00
Mike Jolley f110e81572 Fix select box styling in 2017
Fixes #15824
2017-07-12 15:39:12 +01:00
claudiulodro 8dd21ec1c4 Resolve merge conflicts 2017-07-11 12:11:01 -07:00
claudiulodro 0444cdef3c Initial notice implementation 2017-07-11 11:59:39 -07:00
Mike Jolley 94b32e644a HTML emails 2017-07-11 14:52:30 +01:00
Mike Jolley 3939f50ced Download display in account/checkout 2017-07-11 13:45:35 +01:00
Mike Jolley a527a9566b Add select2 to layered nav 2017-07-10 14:36:47 +01:00
claudiulodro 8a8daabf26 Update with master and recompile assets 2017-07-06 09:06:30 -07:00
claudiulodro e8bd694a6e Keep aria styles for backwards compat. 2017-06-30 13:17:24 -07:00
Mike Jolley 77c938202f Merge branch 'add/15602-store-street-level-address'
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
2017-06-30 15:00:51 +01:00
Mike Jolley d6131f3a74 Field styling 2017-06-30 14:59:45 +01:00
claudiulodro f02c9376c4 Move calls to selectWoo() 2017-06-26 12:44:33 -07:00
claudiulodro ee9c762bdc Enqueue selectWoo 2017-06-26 11:50:08 -07:00
Mike Jolley 1d9148241c Merge pull request #15751 from woocommerce/feature/helper
Helper copy update
2017-06-23 16:17:24 +01:00
José Marques 85e3c4d1f1 Helper: minor coding standards fixes 2017-06-23 12:47:30 +01:00
José Marques 7e396de650 Helper: compresses stylesheet 2017-06-23 09:42:25 +01:00
José Marques ff18825068 Helper connection screen: reduces max width of the notice copy and makes the connection button match the style of the remaining buttons 2017-06-23 09:31:31 +01:00
Mike Jolley 29ba0040d0 Style CSV URL input box correctly
Closes #15735
2017-06-22 11:58:41 +01:00
Mike Jolley 24780e7ace Fix example wrapping 2017-06-21 13:06:25 +01:00
claudiulodro d0266938bf Recompile css 2017-06-19 10:13:27 -07:00
Mike Jolley 85134b91eb Give the icon a background color
Fixes #15673
2017-06-19 13:06:54 +01:00
Mike Jolley a1940f2da3 Grunt dev 2017-06-19 12:49:34 +01:00
Claudio Sanches 594aa66f4e 3.1.0-rc.1 2017-06-14 16:07:22 -03:00
Claudio Sanches e9b64aec7b Merge branch 'master' into fix/15574 2017-06-14 14:05:01 -03:00
Mike Jolley 9f5ff05269 Re-run grunt tasks 2017-06-14 17:58:42 +01:00
Mike Jolley 8e7e8c269f Raise input padding so placeholder is not so squished 2017-06-14 17:56:18 +01:00
Konstantin Kovshenin 247e13e2ca Helper: Various Improvements (#15519)
* Helper: Improve messaging and CTAs

* Helper: Update copy on connect flow

* Helper: Improve messaging around plugins without a subscription

* removes toggle from extensions that cannot be activated

* Helper: Add new `WC_Helper_Compat` class for legacy helper compat

This new class removes some of the actions from the legacy helper
(updater) plugin, attempts to migrate an existing legacy connection
to a new one, attempts to deactivate the old helper plugin.

* Helper: Improve messaging around maxed out subscriptions

* Helper: Enable `WC_Tracker` when connected to WooCommerce.com

* Helper: adds styles for manual licence form row and other visual improvements

* Helper: removes disabled toggles

* Helper: adds styles for connection component

* Helper: redesigned connection module

* Helper: rotates the connection module chevron on mouse hover

* Helper: adds some fixes to the key form on mobile and other updates to meet coding standards

* Helper: Only mark action as primary if there's a CTA button.

* Helper: Better handling for woothemes_updater_notice

Remove the updater notice built into extensions and themes, even
if the legacy Helper plugin is deactivated.

* Helper: Navigate existing Helper users to the new place.

Adds a Dashboard menu item and direct users of the old helper
plugin to the new Extensions screen.

* Helper: Do not show the back-compat menu item for new users

* Helper: Avoid notice in API authentication if credentials are missing

* Helper: Hide the back-compat menu item when users see the new screen

Also sets the user_id for the connection if one was not previously set.
2017-06-14 14:12:53 +01:00
Valerie K 66259ebff1 Update WooCommerce Services copy (#15598)
* Remove excess explanation from wizard shipping step

* Remove distracting link from shipping wizard page

* Update copy on extensions WCS banner

* Update copy on WCS extensions banner for Canada

* Fix extensions WCS banner when read from json

* Add Canada copy on wizard shipping step

* Use strict array comparison in WCS shipping tout

* Add service logos to WCS extension banner

* Use strict array comparison in WCS banner

* Remove related extensions when showing WCS banner

- when store is based in Canada remove Canada Post
extension from shipping page
- when store is based in US remove USPS
extension from shipping page

* Add image alt for logos on WCS banners

* Update WCS banner and wizard content
2017-06-14 11:24:45 +01:00
Mike Jolley 54a9387361 Show attribute data in admin list. 2017-06-12 13:37:52 +01:00
Mike Jolley 27d57e6019 More specific radio hiding
Closes #15538
2017-06-09 14:47:07 +01:00
Mike Jolley eddcb16e00 Update copy + css for zones
Closes #15031
2017-06-06 13:46:09 +01:00
Valerie ed0d0e2fbc Update WCS banner heading spacing 2017-06-05 16:22:30 -04:00
Claudio Sanches 4aec4efa67 Merge pull request #15432 from woocommerce/update/wcs-banner-responsive
Update WooCommerce Services extensions banner
2017-06-05 15:36:22 -03:00
Claudio Sanches 527fa0d07a Fixe CHMOD 2017-06-05 14:45:30 -03:00
Claudiu Lodromanean 2abb868715 Merge pull request #15451 from woocommerce/fix/15441
Fix button styling
2017-06-05 09:19:34 -07:00
Valerie 70570f3745 Update WCS banner style 2017-06-05 11:30:42 -04:00
Mike Jolley 4f72e9e914 Fix button styling 2017-06-05 14:46:57 +01:00
Mike Jolley a348dedfb7 Merge pull request #15397 from woocommerce/update/add-activation-toggles-in-subscriptions
Update/add activation toggles in subscriptions
2017-06-05 14:29:36 +01:00
Mike Jolley d5cb320b7e Font smoothing CSS
Closes #15434
2017-06-05 10:14:31 +01:00
José Marques e77c86a7bc removes cursor from inactive toggles 2017-06-02 11:23:54 +01:00
José Marques 09a3b3d0dd updates active/inactive toggles on the Subscriptions tab 2017-06-01 13:14:38 +01:00
Claudio Sanches 5369bae987 Merge branch 'master' into add/wcs-banners 2017-05-31 16:02:38 -03:00
Nabeel Sulieman ffed9a945e Update CSS files 2017-05-31 09:37:38 -07:00
Mike Jolley c53c83aebb Tweak test and styling 2017-05-31 09:36:32 -07:00
Nabeel Sulieman 10e8c2d82e Use circular controls to indicate radio button on shipping wizard
Regenerate CSS and JS files
2017-05-31 09:35:10 -07:00
Nabeel Sulieman cd2da7fd07 Change style of checkbox in shipping wizard 2017-05-31 09:34:24 -07:00
Nabeel Sulieman c49fa38e2c Make units controls look the same for touted and non-touted
Rename local functions to "location"
2017-05-31 09:33:50 -07:00
Nabeel Sulieman 290fffd053 Update css files using grunt 2017-05-31 09:33:19 -07:00
Nabeel Sulieman 1122faf760 Implement WooCommerce Services NUX in Setup Wizard:
- Rename "shipping locale" to "shipping location"
- Move tax setup to to shipping location page
- Rename shipping & taxes to just shipping
- Implement radio button selection to enable/disable shipping
- Add checkbox for installing WooCommerce services
- Start updating wc-admin css and javascript
2017-05-31 09:31:57 -07:00
Valerie e7672d6572 Enable WCS banner on shipping extension page 2017-05-31 09:27:17 -06:00
Valerie 870e3ddea2 Add WCS banner addons block markup 2017-05-31 09:26:17 -06:00
Mike Jolley 532ddfa6b0 Merge conflicts 2017-05-31 12:23:52 +01:00
Mike Jolley 85b8d8661a Merge pull request #14595 from woocommerce/feature/helper
Helper: First pass at merging the Helper plugin into WooCommerce
2017-05-30 20:39:08 +01:00
Konstantin Kovshenin 1dc7e507b1 Helper: Redesign (work in progress) 2017-05-30 20:50:14 +03:00
Mike Jolley 7f0fcac090 Merge branch 'feature/product-csv-import-export' into feature/product-csv-import-non-existing-data
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
2017-05-25 17:58:34 +01:00