Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #4334

Merged
merged 22 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a3b7353
Sync branch [skip ci]
pirate-bot Nov 22, 2024
e487a93
Sync branch [skip ci]
pirate-bot Nov 22, 2024
6f786e5
update screenshots
selul Nov 22, 2024
2f95613
fix e2e
selul Nov 22, 2024
8139115
fix e2e
selul Nov 22, 2024
a5d6bac
disable visual regression tests
selul Nov 22, 2024
9d6cab9
fix: resolved customizer broken layout with LearnPress
girishpanchal30 Nov 25, 2024
4774928
fix: issue with background color and text color
girishpanchal30 Nov 26, 2024
811ae41
chore: revert starter site content
girishpanchal30 Dec 4, 2024
dcb06c5
chore: update screenshot and README.md as per PR#4255
girishpanchal30 Dec 4, 2024
c87ac7f
fix(test): update element selectors
Soare-Robert-Daniel Dec 4, 2024
69ec2a0
Merge pull request #4342 from Codeinwp/fix/e2e-selectors-update
Soare-Robert-Daniel Dec 4, 2024
5c223fc
Merge branch 'development' of girish.github.com:Codeinwp/neve into fe…
girishpanchal30 Dec 5, 2024
1cb1204
Merge pull request #4341 from Codeinwp/feat/pro/2883
vytisbulkevicius Dec 5, 2024
7e3e43e
Merge branch 'development' of girish.github.com:Codeinwp/neve into bu…
girishpanchal30 Dec 6, 2024
b1c224c
Merge branch 'development' of girish.github.com:Codeinwp/neve into bu…
girishpanchal30 Dec 6, 2024
ab2e348
chore: bump ubuntu version
girishpanchal30 Dec 6, 2024
6f2741e
chore: e2e bump ubuntu version
girishpanchal30 Dec 6, 2024
10530cf
fix: revert other changes
girishpanchal30 Dec 6, 2024
ebdaa7d
Merge pull request #4337 from Codeinwp/bugfix/4335
vytisbulkevicius Dec 6, 2024
27ce61f
Merge branch 'development' of girish.github.com:Codeinwp/neve into bu…
girishpanchal30 Dec 6, 2024
ef73124
Merge pull request #4336 from Codeinwp/bugfix/pro/2872
vytisbulkevicius Dec 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@ jobs:
- specs: "customizer"
envs: "sample-data"
- specs: "admin"
envs: "sample-data"
- specs: "visual-regression"
# envs: "sample-data"
# - specs: "visual-regression"
envs: "sample-data"
- specs: "accessibility"
envs: "sample-data"
- specs: "woo-visual-regression"
envs: "woo-sample"
runs-on: ubuntu-latest
# - specs: "woo-visual-regression"
# envs: "woo-sample"
runs-on: ubuntu-22.04
env:
ZIP_URL: "https://verti-artifacts.s3.amazonaws.com/${{ github.event.pull_request.base.repo.name }}-${{ needs.dev-zip.outputs.branch-name }}-${{ needs.dev-zip.outputs.git-sha-8 }}/neve.zip"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

phpunit:
name: PHPUnit
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
services:
mysql:
image: mysql:5.7
Expand Down
3 changes: 3 additions & 0 deletions assets/customizer/css/_generic.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@
#customize-theme-controls .customize-pane-child.accordion-section-content {
height: 100%;
}
#customize-theme-controls .accordion-section-title button.accordion-trigger {
max-height: fit-content;
}
Binary file removed assets/img/starter-content/0_0-1.jpg
Binary file not shown.
Binary file removed assets/img/starter-content/0_0-2.jpg
Binary file not shown.
Binary file removed assets/img/starter-content/0_0.jpg
Binary file not shown.
Binary file removed assets/img/starter-content/0_1-1.jpg
Binary file not shown.
Binary file removed assets/img/starter-content/0_1.jpg
Binary file not shown.
Binary file removed assets/img/starter-content/0_2-1.jpg
Binary file not shown.
Binary file removed assets/img/starter-content/2.jpg
Binary file not shown.
Binary file removed assets/img/starter-content/6.jpg
Binary file not shown.
Binary file removed assets/img/starter-content/8.jpg
Binary file not shown.
Binary file removed assets/img/starter-content/client-2.jpg
Binary file not shown.
Binary file added assets/img/starter-content/logo-agency.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/img/starter-content/logo.png
Binary file not shown.
Binary file added assets/img/starter-content/neve-hero-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/img/starter-content/neve-marketing-agency-15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/img/starter-content/neve-marketing-agency-17.png
Binary file removed assets/img/starter-content/neve-play1.png
Diff not rendered.
Binary file removed assets/img/starter-content/nv-1.jpg
Diff not rendered.
Binary file removed assets/img/starter-content/nv-3.jpg
Diff not rendered.
Binary file added assets/img/starter-content/person-hero-2.png
Binary file removed assets/img/starter-content/signature-1.png
Diff not rendered.
Binary file removed assets/img/starter-content/signature-2.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
1 change: 1 addition & 0 deletions assets/scss/gutenberg-editor-style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

&, > * {
background-color: var(--nv-site-bg);
color: var(--nv-text-color);
}

.wp-block {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ test.describe('Custom Global Color Control', () => {
'/wp-admin/post.php?post=1&action=edit&test_name=custom-global-colors'
);
await clearWelcome(page);

await page.locator('.block-editor-rich-text__editable').first().click();
// use Background color control to open the color picker, available since WP 6.1
await page.frameLocator('[name="editor-canvas"]').locator('.block-editor-rich-text__editable').first().click();
await page.getByRole('button', { name: 'Background' }).click();
await page.getByRole('option', { name: 'Color: Custom 1' }).click();
await page
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ test.describe('Menu item description', function () {
await page.getByRole('button', { name: 'Add New Category' }).click();
await page.goto('wp-admin/nav-menus.php');

await page
.getByRole('heading', {
name: 'Categories Press return or enter to open this section ',
})
.click();
await page.getByRole('button', { name: 'Categories' }).click();
await page
.locator('#taxonomy-category-tabs')
.getByRole('link', { name: 'View All' })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ test.describe('Single Post Check', function () {
});

await page.goto('/template-comments/?test_name=metaOrder');
await page.screenshot({ path: 'metaOrder.png' });
const metaOrder = ['category', 'date', 'comments', 'author'];
await checkElementsOrder(page, '.nv-meta-list', metaOrder);

Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/specs/visual-regression/single-post.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ test.describe('Single Post', () => {
continue;
}
await scrollTo(page, position.y);
await page.waitForTimeout(500);
await page.waitForTimeout(2000);
await expect(page).toHaveScreenshot({ maxDiffPixelRatio: 0.01 });
}
});
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/specs/visual-regression/starter-sites.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ test.describe('Starter sites check', () => {
await page.goto(url + '?optml_off=true&onboarding=true');
await page.keyboard.press('End');
await page.evaluate(() => window.scrollTo(0, 0));
await page.waitForTimeout(500);
await page.waitForTimeout(2000);
await expect(page).toHaveScreenshot({
maxDiffPixelRatio: 0.18,
fullPage: true,
Expand Down
356 changes: 356 additions & 0 deletions inc/compatibility/starter-content/about.php

Large diffs are not rendered by default.

156 changes: 156 additions & 0 deletions inc/compatibility/starter-content/contact.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
<?php
/**
* Contact us starter content.
*
* @package Neve\Compatibility\Starter_Content
*/

return [
'post_type' => 'page',
'post_name' => 'contact',
'post_title' => _x( 'Contact', 'Theme starter content', 'neve' ),
'post_content' => '<!-- wp:cover {"overlayColor":"nv-site-bg","isUserOverlayColor":true,"minHeight":300,"align":"full","style":{"spacing":{"padding":{"right":"0","left":"0"}}}} -->
<div class="wp-block-cover alignfull" style="padding-right:0;padding-left:0;min-height:300px"><span aria-hidden="true" class="wp-block-cover__background has-nv-site-bg-background-color has-background-dim-100 has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30"}}}} -->
<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--30);padding-left:var(--wp--preset--spacing--30)"><!-- wp:heading {"level":1,"textColor":"neve-text-color","className":"has-text-align-left"} -->
<h1 class="wp-block-heading has-text-align-left has-neve-text-color-color has-text-color">Contact us</h1>
<!-- /wp:heading --></div>
<!-- /wp:group --></div></div>
<!-- /wp:cover -->

<!-- wp:cover {"overlayColor":"nv-light-bg","isUserOverlayColor":true,"minHeight":420,"align":"full"} -->
<div class="wp-block-cover alignfull" style="min-height:420px"><span aria-hidden="true" class="wp-block-cover__background has-nv-light-bg-background-color has-background-dim-100 has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:spacer {"height":"80px"} -->
<div style="height:80px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:columns -->
<div class="wp-block-columns"><!-- wp:column {"style":{"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30"}}},"className":"ticss-4ce656f1"} -->
<div class="wp-block-column ticss-4ce656f1" style="padding-right:var(--wp--preset--spacing--30);padding-left:var(--wp--preset--spacing--30)"><!-- wp:group {"style":{"border":{"radius":"24px"}},"backgroundColor":"nv-site-bg"} -->
<div class="wp-block-group has-nv-site-bg-background-color has-background" style="border-radius:24px"><!-- wp:spacer {"height":"24px"} -->
<div style="height:24px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:image {"sizeSlug":"full","linkDestination":"none","align":"center","className":"icon-style is-style-default"} -->
<figure class="wp-block-image aligncenter size-full icon-style is-style-default"><img src="' . trailingslashit( get_template_directory_uri() ) . 'assets/img/starter-content/neve-marketing-icon-7.png" alt=""/></figure>
<!-- /wp:image -->

<!-- wp:spacer {"height":"24px"} -->
<div style="height:24px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:heading {"level":3,"textColor":"neve-text-color","className":"has-text-align-center"} -->
<h3 class="wp-block-heading has-text-align-center has-neve-text-color-color has-text-color">Call us</h3>
<!-- /wp:heading -->

<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":15}},"textColor":"neve-text-color"} -->
<p class="has-text-align-center has-neve-text-color-color has-text-color" style="font-size:15px">509-728-8632 | Monday - Friday</p>
<!-- /wp:paragraph -->

<!-- wp:spacer {"height":"24px"} -->
<div style="height:24px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer --></div>
<!-- /wp:group --></div>
<!-- /wp:column -->

<!-- wp:column {"style":{"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30"}}},"className":"ticss-f6fc7494"} -->
<div class="wp-block-column ticss-f6fc7494" style="padding-right:var(--wp--preset--spacing--30);padding-left:var(--wp--preset--spacing--30)"><!-- wp:group {"style":{"border":{"radius":"24px"}},"backgroundColor":"nv-site-bg"} -->
<div class="wp-block-group has-nv-site-bg-background-color has-background" style="border-radius:24px"><!-- wp:spacer {"height":"24px"} -->
<div style="height:24px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:image {"sizeSlug":"full","linkDestination":"none","align":"center","className":"icon-style is-style-default"} -->
<figure class="wp-block-image aligncenter size-full icon-style is-style-default"><img src="' . trailingslashit( get_template_directory_uri() ) . 'assets/img/starter-content/neve-marketing-icon-5.png" alt=""/></figure>
<!-- /wp:image -->

<!-- wp:spacer {"height":"24px"} -->
<div style="height:24px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:heading {"level":3,"textColor":"neve-text-color","className":"has-text-align-center"} -->
<h3 class="wp-block-heading has-text-align-center has-neve-text-color-color has-text-color">Email</h3>
<!-- /wp:heading -->

<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":15}},"textColor":"neve-text-color"} -->
<p class="has-text-align-center has-neve-text-color-color has-text-color" style="font-size:15px">[email protected]</p>
<!-- /wp:paragraph -->

<!-- wp:spacer {"height":"24px"} -->
<div style="height:24px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer --></div>
<!-- /wp:group --></div>
<!-- /wp:column -->

<!-- wp:column {"style":{"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30"}}},"className":"ticss-a5b4df29"} -->
<div class="wp-block-column ticss-a5b4df29" style="padding-right:var(--wp--preset--spacing--30);padding-left:var(--wp--preset--spacing--30)"><!-- wp:group {"style":{"border":{"radius":"24px"}},"backgroundColor":"nv-site-bg"} -->
<div class="wp-block-group has-nv-site-bg-background-color has-background" style="border-radius:24px"><!-- wp:spacer {"height":"24px"} -->
<div style="height:24px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:image {"sizeSlug":"full","linkDestination":"none","align":"center","className":"icon-style is-style-default"} -->
<figure class="wp-block-image aligncenter size-full icon-style is-style-default"><img src="' . trailingslashit( get_template_directory_uri() ) . 'assets/img/starter-content/neve-marketing-icon-6.png" alt=""/></figure>
<!-- /wp:image -->

<!-- wp:spacer {"height":"24px"} -->
<div style="height:24px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:heading {"level":3,"textColor":"neve-text-color","className":"has-text-align-center"} -->
<h3 class="wp-block-heading has-text-align-center has-neve-text-color-color has-text-color">Offices</h3>
<!-- /wp:heading -->

<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":15}},"textColor":"neve-text-color"} -->
<p class="has-text-align-center has-neve-text-color-color has-text-color" style="font-size:15px">2982 Sun Valley Road, Washington</p>
<!-- /wp:paragraph -->

<!-- wp:spacer {"height":"24px"} -->
<div style="height:24px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer --></div>
<!-- /wp:group --></div>
<!-- /wp:column --></div>
<!-- /wp:columns -->

<!-- wp:spacer {"height":"30px"} -->
<div style="height:30px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer --></div></div>
<!-- /wp:cover -->

<!-- wp:cover {"overlayColor":"nv-dark-bg","isUserOverlayColor":true,"minHeight":600,"align":"full"} -->
<div class="wp-block-cover alignfull" style="min-height:600px"><span aria-hidden="true" class="wp-block-cover__background has-nv-dark-bg-background-color has-background-dim-100 has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:group -->
<div class="wp-block-group"><!-- wp:spacer {"height":"80px"} -->
<div style="height:80px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:cover {"url":"' . trailingslashit( get_template_directory_uri() ) . 'assets/img/starter-content/neve-marketing-agency-25.png","dimRatio":50,"overlayColor":"neve-link-color","isUserOverlayColor":true,"style":{"border":{"radius":"24px"}},"layout":{"type":"constrained"}} -->
<div class="wp-block-cover" style="border-radius:24px"><span aria-hidden="true" class="wp-block-cover__background has-neve-link-color-background-color has-background-dim"></span><img class="wp-block-cover__image-background" alt="" src="' . trailingslashit( get_template_directory_uri() ) . 'assets/img/starter-content/neve-marketing-agency-25.png" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"Write title…","fontSize":"large"} -->
<p class="has-text-align-center has-large-font-size"></p>
<!-- /wp:paragraph --></div></div>
<!-- /wp:cover -->

<!-- wp:spacer {"height":"40px"} -->
<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:columns -->
<div class="wp-block-columns"><!-- wp:column {"width":"50%","style":{"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30"}}}} -->
<div class="wp-block-column" style="padding-right:var(--wp--preset--spacing--30);padding-left:var(--wp--preset--spacing--30);flex-basis:50%"><!-- wp:heading {"textColor":"nv-text-dark-bg"} -->
<h2 class="wp-block-heading has-nv-text-dark-bg-color has-text-color">Send us a message or Come visit us</h2>
<!-- /wp:heading -->

<!-- wp:paragraph {"textColor":"white"} -->
<p class="has-white-color has-text-color">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut elit tellus, luctus nec ullamcorper mattis, pulvinar dapibus leo.</p>
<!-- /wp:paragraph -->

<!-- wp:social-links {"iconColor":"nv-text-dark-bg","iconColorValue":"var(\u002d\u002dnv-text-dark-bg)","size":"has-normal-icon-size","className":"is-style-pill-shape"} -->
<ul class="wp-block-social-links has-normal-icon-size has-icon-color is-style-pill-shape"><!-- wp:social-link {"url":"#","service":"facebook"} /-->

<!-- wp:social-link {"url":"#","service":"twitter"} /-->

<!-- wp:social-link {"url":"#","service":"google"} /--></ul>
<!-- /wp:social-links --></div>
<!-- /wp:column -->

<!-- wp:spacer {"height":"40px"} -->
<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer --></div>
<!-- /wp:group --></div></div>
<!-- /wp:cover -->',
];
Loading
Loading