diff --git a/.github/workflows/bump-channel-version/action.yml b/.github/workflows/bump-channel-version/action.yml index 733cfd93e80b..eb8a9464cd90 100644 --- a/.github/workflows/bump-channel-version/action.yml +++ b/.github/workflows/bump-channel-version/action.yml @@ -49,15 +49,18 @@ runs: fi if [[ ${{ inputs.CHANNEL }} == "beta" ]]; then - BETA_VERSION=${{ inputs.CLEAN_PACKAGE_VERSION }}-${{ inputs.CHANNEL }}${NEW_CHANNEL_VERSION} - echo "BETA_VERSION=$BETA_VERSION" >> $GITHUB_ENV - - if grep -q "Beta tag:" ./readme.txt - then - echo "Replace existing beta tag in readme file" - sed -i -E "s/Beta tag: .*/Beta tag: $BETA_VERSION/g" ./readme.txt - else - echo "Add beta tag to readme file" - sed -i -E '/^Stable tag: .*/a\'$'\n'"Beta tag: $BETA_VERSION$(printf '\n\r')" ./readme.txt - fi + BETA_VERSION=${ELEMENTOR_CHANNEL_PACKAGE_VERSION} + else + BETA_VERSION=$(git ls-remote --tags | awk '{print $2}' | sed 's/^refs\/tags\/v//' | sed 's/^refs\/tags\///' | grep -E '^[0-9]+\.[0-9]+\.[0-9]-beta[1-9]$' | sort -V | tail -n 1) + fi + + echo "BETA_VERSION=$BETA_VERSION" + + if grep -q "Beta tag:" ./readme.txt + then + echo "Replace existing beta tag in readme file" + sed -i -E "s/Beta tag: .*/Beta tag: $BETA_VERSION/g" ./readme.txt + else + echo "Add beta tag to readme file" + sed -i -E '/^Stable tag: .*/a\'$'\n'"Beta tag: $BETA_VERSION$(printf '\n\r')" ./readme.txt fi diff --git a/.github/workflows/latest-release.yml b/.github/workflows/latest-release.yml index 748c810118c5..119a894507f1 100644 --- a/.github/workflows/latest-release.yml +++ b/.github/workflows/latest-release.yml @@ -16,13 +16,15 @@ concurrency: cancel-in-progress: true jobs: - if_merged: - if: github.event.pull_request.merged == true - runs-on: ubuntu-22.04 - steps: - - run: | - echo ${{ github.event.pull_request.merged }} was succesfully merged +# if_merged: +# if: github.event.pull_request.merged == true && github.base_ref == 'master' && !contains(github.event.pull_request.labels.*.name, 'skip release') +# runs-on: ubuntu-22.04 +# steps: +# - run: | +# echo ${{ github.event.pull_request.merged }} was succesfully merged +# echo $ latest_release: + if: github.event.pull_request.merged == true && github.base_ref == 'master' && !contains(github.event.pull_request.labels.*.name, 'skip release') runs-on: ubuntu-22.04 steps: - name: checkout branch diff --git a/.github/workflows/one-click-hosting-release.yml b/.github/workflows/one-click-hosting-release.yml index 72e6c482b17d..2c0d0eb22a0a 100644 --- a/.github/workflows/one-click-hosting-release.yml +++ b/.github/workflows/one-click-hosting-release.yml @@ -83,7 +83,7 @@ jobs: ${{ env.CHANGELOG_FILE }} prerelease: ${{ github.event.inputs.pre_release }} body_path: ${{ env.CHANGELOG_FILE }} - - name: Post To Slack Created Cloud one click Release + - name: Post To Slack Created one click Hosting Release if: ${{ github.event.inputs.pre_release }} == false uses: ./.github/workflows/post-to-slack with: @@ -96,7 +96,7 @@ jobs: "type": "section", "text": { "type": "mrkdwn", - "text": "Hi All :smile:\n\nWe just Published Could release of *Elementor*\n`${{ env.PACKAGE_VERSION }}`" + "text": "Hi All :smile:\n\nWe just Published a Hosting release of *Elementor*\n`${{ env.PACKAGE_VERSION }}`" } }, { diff --git a/core/editor/loader/v2/scss/editor-v2-overrides.scss b/core/editor/loader/v2/scss/editor-v2-overrides.scss index 853935080c20..17f18dc5ed19 100644 --- a/core/editor/loader/v2/scss/editor-v2-overrides.scss +++ b/core/editor/loader/v2/scss/editor-v2-overrides.scss @@ -28,3 +28,22 @@ body.elementor-navigator-docked #elementor-navigator { border-bottom: var( --e-a-border ); height: 48px; } + +// Make the MCE full-screen work properly with the top bar. +.elementor-control-type-wysiwyg .mce-fullscreen { + inset: var(--editor-v2-top-bar-height) 0 0 0; + + & > .mce-container-body { + display: flex; + flex-direction: column; + height: 100%; + + & > .mce-edit-area { + flex-grow: 1; + + & > iframe { + height: 100% !important; + } + } + } +}