Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/Codeinwp/neve into f…
Browse files Browse the repository at this point in the history
…ix/dashboard-permissions
  • Loading branch information
cristian-ungureanu committed Sep 15, 2023
2 parents 0f562ed + e5f7194 commit 1c1d7e0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const PaletteForm = ({ values, save, disabled }) => {
iconSize={16}
onClick={toggleAdding}
>
{__('Add Custom Palette')}
{__('Add Custom Palette', 'neve')}
</Button>
</div>
);
Expand Down
1 change: 0 additions & 1 deletion assets/scss/components/elements/_mega-menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
position: absolute;
padding: 20px 10px;
top: auto;
display: none;

&:not(.dropdown-open) {
pointer-events: none;
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/specs/woo-visual-regression/checkout.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ test.describe('Checkout page check', () => {
await page.goto('/checkout/');
await page.locator('#place_order').click();
await page.waitForTimeout(1000);
await expect(page).toHaveScreenshot({ maxDiffPixelRatio: 0.01 });
await expect(page).toHaveScreenshot({ maxDiffPixelRatio: 0.2 });
});

test('Check MyAccount errors', async ({ page }) => {
await page.goto('/my-account/edit-account/');
await page.locator('.woocommerce-Button').first().click();
await expect(page).toHaveScreenshot({ maxDiffPixelRatio: 0.01 });
await expect(page).toHaveScreenshot({ maxDiffPixelRatio: 0.2 });
});
});
2 changes: 2 additions & 0 deletions inc/core/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ private function maybe_register_notice_script_starter_sites() {

wp_localize_script( 'neve-ss-notice', 'tpcPluginData', $this->get_tpc_plugin_data() );
wp_enqueue_script( 'neve-ss-notice' );
wp_set_script_translations( 'neve-ss-notice', 'neve' );
}

/**
Expand All @@ -177,6 +178,7 @@ public function register_react_components() {
'customizerURL' => esc_url( admin_url( 'customize.php' ) ),
]
);
wp_set_script_translations( 'neve-components', 'neve' );
wp_register_style( 'neve-components', trailingslashit( NEVE_ASSETS_URL ) . 'apps/components/build/style-components.css', [ 'wp-components' ], $deps['version'] );
wp_add_inline_style( 'neve-components', Dynamic_Css::get_root_css() );
}
Expand Down

0 comments on commit 1c1d7e0

Please sign in to comment.