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
…eat/beaver-color-presets
  • Loading branch information
cristian-ungureanu committed Apr 24, 2021
2 parents 38a2d2a + 6a0e52c commit 0a8b217
Show file tree
Hide file tree
Showing 52 changed files with 781 additions and 359 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": [ "plugin:@wordpress/eslint-plugin/recommended" ],
"ignorePatterns": ["**/vendor/**"]
}
}
2 changes: 1 addition & 1 deletion .github/workflows/create-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
id: release
run: |
yarn install --frozen-lockfile
composer install --no-dev --prefer-dist --no-progress --no-suggest
composer install --prefer-dist --no-progress --no-suggest
yarn run build
yarn run release
env:
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/pr_verify_linked_issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Verify PR

on:
pull_request:
types: [ edited, synchronize, opened, reopened ]
branches:
- development
check_run:

jobs:
verify_linked_issue:
runs-on: ubuntu-latest
if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
name: Ensure Pull Request has a linked issue.
steps:
- name: Verify Linked Issue
id: verify_linked_issues
uses: Codeinwp/verify-linked-issue-action@master
env:
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
with:
quiet: 'true'
- name: Find Comment
uses: peter-evans/find-comment@v1
id: find_coomment
with:
issue-number: ${{ github.event.pull_request.number }}
comment-author: 'pirate-bot'
body-includes: No Linked Issue found
- name: Create or update comment
uses: peter-evans/create-or-update-comment@v1
if: steps.verify_linked_issues.outputs.has_linked_issues != 'true'
with:
comment-id: ${{ steps.find_coomment.outputs.comment-id }}
token: ${{ secrets.BOT_TOKEN }}
issue-number: ${{ github.event.pull_request.number }}
body: |
:guardsman: PR Error! No Linked Issue found. Please link an issue or mention it in the body using #<issue_id>
edit-mode: replace
- name: Fail action on no issue found
if: steps.verify_linked_issues.outputs.has_linked_issues == 'false'
run: exit 1;
- name: Delete comment
uses: jungwinter/comment@v1
if: steps.verify_linked_issues.outputs.has_linked_issues == 'true' && steps.find_coomment.outputs.comment-id != ''
with:
type: delete
comment_id: ${{ steps.find_coomment.outputs.comment-id }}
token: ${{ secrets.BOT_TOKEN }}
4 changes: 0 additions & 4 deletions .github/workflows/test-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v1
with:
path: ~/.wp-content
key: ${{ runner.os }}-wpcore
- name: Get Composer Cache Directory
id: composer-cache
run: |
Expand Down
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
##### [Version 2.11.1](https://github.com/Codeinwp/neve/compare/v2.11.0...v2.11.1) (2021-04-13)

- [Fix] Fatal error caused by the removal of some global functions

#### [Version 2.11.0](https://github.com/Codeinwp/neve/compare/v2.10.4...v2.11.0) (2021-04-12)

- [Fix] Masonry on the blog
- [Fix] Sync theme mods on child themes
- [Fix] Load proper weights for fonts in the customizer
- [Fix] Global colors switching back when the color-picker is opened and input is focused
- [Fix] Header cart icon not updating the total amount when adding a new product
- [Fix] Hide the empty comment tag if comments are not enabled
- [Fix] Hover color for secondary buttons when WooCommerce is active
- [Fix] Headings not inheriting body font when set as default
- [Fix] Active buttons from the editor sidebar overlapping the panel heading
- [Feat] Allow hosting Google Fonts locally
- Show last updated date on posts
- New developer hooks

##### [Version 2.10.4](https://github.com/Codeinwp/neve/compare/v2.10.3...v2.10.4) (2021-03-16)

- [Fix] customizer responsive switches not working
Expand Down
17 changes: 9 additions & 8 deletions assets/js/src/frontend/navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,16 +151,17 @@ function handleSearch() {
* Handle the mini cart position in nav.
*/
function handleMiniCartPosition() {
const elem = document.querySelectorAll('.header--row .nv-nav-cart');
if (elem.length === 0) {
const item = document.querySelector('.header--row .menu-item-nav-cart');
if (item === null) {
return;
}
neveEach(elem, (item) => {
const bounding = item.getBoundingClientRect();
if (bounding.left < 0) {
item.style.left = 0;
}
});

const miniCart = item.querySelector('.nv-nav-cart');

if (miniCart !== null) {
miniCart.style.left =
item.getBoundingClientRect().left < 350 ? 0 : null;
}
}

window.addEventListener('resize', handleMiniCartPosition);
Expand Down
10 changes: 9 additions & 1 deletion assets/scss/gutenberg-editor/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,19 @@ h6 {
font-size: 16px;
font-weight: normal;
font-family: $default-font-family;
color: var(--nv-text-color);
line-height: $line-height-base;
text-transform: none;
letter-spacing: normal;

&.wp-block-group.has-background {
padding: 0;
}
&:not(.wp-block-group.has-text-color){
.wp-block{
color: var(--nv-text-color);
}
}

&.components-placeholder {
color: initial;
}
Expand Down
1 change: 0 additions & 1 deletion bin/envs/amp/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ wp menu create sample-menu --allow-root
wp menu location assign sample-menu primary --allow-root
wp menu item add-post sample-menu 1 --title="Parent menu" --allow-root
wp menu item add-post sample-menu 1 --title="Submenu Item" --allow-root --parent-id="$(wp menu item list sample-menu --allow-root --format=ids)"
wp --allow-root option patch update amp-options theme_support 'transitional'
2 changes: 2 additions & 0 deletions bin/envs/cli-setup.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash
set -e
NEVE_LOCATION=$1
WP_VERSION=$2
WP_ENV=$3
Expand Down
3 changes: 2 additions & 1 deletion bin/envs/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ ZIP_URL=${4}

if [ ! -n "$ZIP_URL" ]
then
yarn install --frozen-lockfile
# Install dependencies.
composer install --no-dev
yarn install --frozen-lockfile
yarn run build
yarn run dist
ZIP_URL="/tmp/repo/neve/artifact/neve.zip"
fi
Expand Down
5 changes: 5 additions & 0 deletions dashboard/assets/template-cloud.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions dashboard/inc/Main.php
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,13 @@ private function get_localization() {
'upgradeURL' => esc_url( apply_filters( 'neve_upgrade_link_from_child_theme_filter', 'https://themeisle.com/themes/neve/upgrade/?utm_medium=aboutneve&utm_source=freevspro&utm_campaign=neve' ) ),
'supportURL' => esc_url( 'https://wordpress.org/support/theme/neve/' ),
'docsURL' => esc_url( 'https://docs.themeisle.com/article/946-neve-doc' ),
'codexURL' => esc_url( 'https://codex.nevewp.com/' ),
'strings' => [
'proTabTitle' => wp_kses_post( $plugin_name ),
/* translators: %s - Theme name */
'header' => sprintf( __( '%s Options', 'neve' ), wp_kses_post( $theme_name ) ),
/* translators: %s - Theme name */
'starterSitesCardDescription' => sprintf( __( '%s now comes with a sites library with various designs to pick from. Visit our collection of demos that are constantly being added.', 'neve' ), wp_kses_post( $theme_name ) ),
/* translators: %s - "Public roadmap" */
'sidebarCommunityDescription' => sprintf( __( 'Share opinions, ask questions and help each other on our Neve community! Keep up with what we’re working on and vote to help us prioritize on our %s.', 'neve' ), wp_kses_post( '<a href="https://neve.nolt.io">' . __( 'public roadmap', 'neve' ) . '</a>' ) ),
/* translators: %s - Theme name */
'starterSitesTabDescription' => sprintf( __( 'With %s, you can choose from multiple unique demos, specially designed for you, that can be installed with a single click. You just need to choose your favorite, and we will take care of everything else.', 'neve' ), wp_kses_post( $theme_name ) ),
/* translators: %s - Theme name */
Expand All @@ -222,7 +221,7 @@ private function get_localization() {
'licenseCardDescription' => sprintf(
// translators: store name (Themeisle)
__( 'Enter your license from %1$s purchase history in order to get plugin updates', 'neve' ),
'<a href="https://store.themeisle.com/">ThemeIsle</a>'
'<a target="_blank" rel="external noreferrer noopener" href="https://store.themeisle.com/">ThemeIsle<span class="components-visually-hidden">' . esc_html__( '(opens in new tab)', 'neve' ) . '</span><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="components-external-link__icon css-6wogo1-StyledIcon etxm6pv0" role="img" aria-hidden="true" focusable="false"><path d="M18.2 17c0 .7-.6 1.2-1.2 1.2H7c-.7 0-1.2-.6-1.2-1.2V7c0-.7.6-1.2 1.2-1.2h3.2V4.2H7C5.5 4.2 4.2 5.5 4.2 7v10c0 1.5 1.2 2.8 2.8 2.8h10c1.5 0 2.8-1.2 2.8-2.8v-3.6h-1.5V17zM14.9 3v1.5h3.7l-6.4 6.4 1.1 1.1 6.4-6.4v3.7h1.5V3h-6.3z"></path></svg></a>'
),
],
'changelog' => $this->cl_handler->get_changelog( get_template_directory() . '/CHANGELOG.md' ),
Expand Down
10 changes: 9 additions & 1 deletion dashboard/src/Components/Content/FreePro.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,16 @@ const Pro = () => {
'neve'
)}
</p>
<Button href={neveDash.upgradeURL} isPrimary>
<Button
target="_blank"
rel="external noreferrer noopener"
href={neveDash.upgradeURL}
isPrimary
>
{__('Get Neve Pro Now', 'neve')}
<span className="components-visually-hidden">
{__('(opens in a new tab)', 'neve')}
</span>
</Button>
</div>
</div>
Expand Down
55 changes: 33 additions & 22 deletions dashboard/src/Components/Content/Help.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import Card from '../Card';

import { __ } from '@wordpress/i18n';
import { Fragment } from '@wordpress/element';
import { Button, Icon } from '@wordpress/components';
import { Button, Icon, ExternalLink } from '@wordpress/components';

const Help = (props) => {
const { setTab } = props;

let { docsURL, supportURL, whiteLabel, assets } = neveDash;
let { docsURL, codexURL, supportURL, whiteLabel, assets } = neveDash;
const { supportCardDescription, docsCardDescription } = neveDash.strings;

if (whiteLabel && whiteLabel.agencyURL) {
Expand All @@ -30,30 +30,38 @@ const Help = (props) => {
'neve'
)}
>
<Button
isLink
href="http://docs.themeisle.com/article/219-how-to-build-a-landing-page-with-a-drag-and-drop-content-builder"
>
<ExternalLink href="http://docs.themeisle.com/article/219-how-to-build-a-landing-page-with-a-drag-and-drop-content-builder">
{__('Learn More', 'neve')}
</Button>
</ExternalLink>
</Card>
)}
<Card
icon={assets + 'page.svg'}
title={__('Documentation', 'neve')}
description={docsCardDescription}
>
<Button isLink href={docsURL}>
{!whiteLabel && (
<ExternalLink href={codexURL}>
{__('Go to Neve Codex', 'neve')}
</ExternalLink>
)}
<ExternalLink href={docsURL}>
{__('Go to docs', 'neve')}
</Button>
</ExternalLink>
{!whiteLabel && (
<a
<Button
isLink
className="facebook-badge"
href="https://www.facebook.com/groups/648646435537266/"
target="_blank"
rel="external noreferrer noopener"
>
<span className="components-visually-hidden">
{__('(opens in a new tab)', 'neve')}
</span>
<Icon icon="facebook-alt" />
<span>{__('Join our Facebook Group', 'neve')}</span>
</a>
</Button>
)}
</Card>

Expand All @@ -66,12 +74,9 @@ const Help = (props) => {
'neve'
)}
>
<Button
isLink
href="http://docs.themeisle.com/article/14-how-to-create-a-child-theme"
>
<ExternalLink href="http://docs.themeisle.com/article/14-how-to-create-a-child-theme">
{__('Learn More', 'neve')}
</Button>
</ExternalLink>
</Card>
)}

Expand All @@ -80,7 +85,15 @@ const Help = (props) => {
title={__('Contact Support', 'neve')}
description={supportCardDescription}
>
<Button isPrimary href={supportURL}>
<Button
isPrimary
href={supportURL}
target="_blank"
rel="external noreferrer noopener"
>
<span className="components-visually-hidden">
{__('(opens in a new tab)', 'neve')}
</span>
{__('Contact Support', 'neve')}
</Button>
</Card>
Expand All @@ -94,12 +107,9 @@ const Help = (props) => {
'neve'
)}
>
<Button
isLink
href="http://docs.themeisle.com/article/63-speed-up-your-wordpress-site"
>
<ExternalLink href="http://docs.themeisle.com/article/63-speed-up-your-wordpress-site">
{__('Learn More', 'neve')}
</Button>
</ExternalLink>
</Card>
)}
{!whiteLabel && (
Expand All @@ -110,6 +120,7 @@ const Help = (props) => {
'Want to get the gist on the latest theme changes? Just consult our changelog below to get a taste of the recent fixes and features implemented.',
'neve'
)}
ßßßßß
>
<Button isLink onClick={() => setTab('changelog')}>
{__('View Changelog', 'neve')}
Expand Down
Loading

0 comments on commit 0a8b217

Please sign in to comment.