Skip to content

Commit 32f60cf

Browse files
garikhggarikhg
authored
Merge pull request #24 from wpkitpro/develop
Develop
2 parents 5ff3f4f + 989de5a commit 32f60cf

26 files changed

+1139
-738
lines changed

‎.github/scripts/get-release-branch-name.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
set -eo pipefail
3+
4+
if [ -z "$INPUT_VERSION" ];
5+
then
6+
PACKAGE_VERSION=$(node -p "require('./package.json').version")
7+
npm install --no-package-lock --no-save semver@7.3.4
8+
NEXT_PACKAGE_VERSION=$(npx semver $PACKAGE_VERSION -i minor)
9+
RELEASE_BRANCH="release/${NEXT_PACKAGE_VERSION}"
10+
else
11+
echo "Version var is set to ${INPUT_VERSION}"
12+
RELEASE_BRANCH="release/${INPUT_VERSION}"
13+
fi
14+
echo "RELEASE_BRANCH=${RELEASE_BRANCH}" >> $GITHUB_ENV

‎.github/scripts/update-version-in-files.js‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
'use strict';
2+
3+
const replaceInFile = require('replace-in-file');
4+
5+
const {VERSION} = process.env;
6+
7+
const replaceInFileWithLog = async (options) => {
8+
const results = await replaceInFile(options);
9+
console.log('Replacement results:', results, 'options: ', options);
10+
};
11+
12+
const run = async () => {
13+
try {
14+
await replaceInFileWithLog( {
15+
files: './assets/scss/style.scss',
16+
from: /Version:.*$/m,
17+
to: `Version: ${ VERSION }`,
18+
} );
19+
20+
await replaceInFileWithLog( {
21+
files: './functions.php',
22+
from: /WPKIT_ELEMENTOR_VERSION', '(.*?)'/m,
23+
to: `WPKIT_ELEMENTOR_VERSION', '${ VERSION }'`,
24+
} );
25+
26+
} catch (err) {
27+
console.error('Error occurred:', err);
28+
process.exit(1);
29+
}
30+
}
31+
32+
run();

‎.github/workflows/publish-release.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Publish Release Version
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: 'Release branch version'
8+
required: false
9+
10+
jobs:
11+
merge-release-branch-to-develop:
12+
if: (github.actor == 'ronkelementor' || github.actor == 'KingYes') && startsWith(github.repository, 'wpkitpro/')
13+
runs-on: ubuntu-20.04
14+
steps:
15+
- name: Checkout main branch
16+
uses: actions/checkout@v2
17+
with:
18+
token: ${{ secrets.MAINTAIN_TOKEN }}
19+
ref: main
20+
- name: Get release branch
21+
env:
22+
INPUT_VERSION: ${{ github.event.inputs.version }}
23+
run: |
24+
bash "${GITHUB_WORKSPACE}/.github/scripts/get-release-branch-name.sh"
25+
- name: Checkout release branch
26+
uses: actions/checkout@v2
27+
with:
28+
token: ${{ secrets.MAINTAIN_TOKEN }}
29+
ref: ${{ env.RELEASE_BRANCH }}
30+
- name: Merge release -> develop
31+
uses: devmasx/merge-branch@a1752b9ba42bb417ec19be7dc974e2faf77d3ef2 # v1.3.1
32+
with:
33+
type: now
34+
from_branch: ${{ env.RELEASE_BRANCH }}
35+
target_branch: develop
36+
github_token: ${{ secrets.MAINTAIN_TOKEN }}
37+
bump-version:
38+
needs: merge-release-branch-to-develop
39+
runs-on: ubuntu-16.04
40+
outputs:
41+
prev_version: ${{ steps.bump_version_step.outputs.prev_version }}
42+
steps:
43+
- name: Checkout develop branch
44+
uses: actions/checkout@v2
45+
with:
46+
token: ${{ secrets.MAINTAIN_TOKEN }}
47+
ref: develop
48+
- name: Bump version
49+
id: bump_version_step
50+
run: |
51+
npm config set git-tag-version false
52+
PREV_PACKAGE_VERSION=$(node -p "require('./package.json').version")
53+
npm version minor
54+
PACKAGE_VERSION=$(node -p "require('./package.json').version")
55+
echo "PACKAGE_VERSION=${PACKAGE_VERSION}" >> $GITHUB_ENV
56+
echo "::set-output name=prev_version::${PREV_PACKAGE_VERSION}"
57+
- name: Update version in files
58+
env:
59+
VERSION: ${{ env.PACKAGE_VERSION }}
60+
run: |
61+
npm install --no-package-lock --no-save replace-in-file@6.2.0
62+
node ./.github/scripts/update-version-in-files.js
63+
#npx grunt wp_readme
64+
- name: Check if readme.txt update

‎Gruntfile.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module.exports = function( grunt ) {
77
require( 'load-grunt-tasks' )( grunt );
88

99
const sass = require( 'sass' );
10+
const textDomain = 'wp-kit-elementor';
1011

1112
// Project configuration.
1213
grunt.initConfig( {
@@ -84,7 +85,7 @@ module.exports = function( grunt ) {
8485

8586
checktextdomain: {
8687
options: {
87-
text_domain: 'wp-kit-elementor',
88+
text_domain: textDomain,
8889
correct_domain: true,
8990
keywords: [
9091
// WordPress keywords

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
A lightweight and minimalist WordPress theme for Elementor site builder.
44

5-
<p><a href="https://wpkit.pro/themes/wpkit-elementor"><img src="https://i0.wp.com/themes.svn.wordpress.org/wp-kit-elementor/1.0.3/screenshot.png?w=600&strip=all" alt="WP Kit Elementor"></a></p>
5+
<p><a href="https://wpkit.pro/themes/wpkit-elementor"><img src="https://wpkit.pro/wp-content/uploads/wporg-theme-images/screenshot.png?w=600&strip=all" alt="WP Kit Elementor"></a></p>
66

77
## Description
88

‎assets/sass/abstracts/_mixins.scss‎

Whitespace-only changes.

‎assets/sass/abstracts/_variables.scss‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Colors
2+
$blue: #605be5 !default;
3+
$dark-blue: #333366 !default;
4+
5+
6+
// Text and Paragraph
7+
$text-color: #212529;
8+
9+
// Fonts
10+
$font-family-base: -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
11+
$font-size-base: 1rem !default;
12+
$line-height-base: 1.5 !default;
13+
$body-color: $text-color !default;
14+
$body-bg: #ffffff !default;
15+
$font-weight-base: 400 !default;
16+
17+
// Link
18+
$link-color: $blue !default;
19+
$link-hover-color: $dark-blue !default;

‎assets/sass/generic/_forms.scss‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
/**
2+
* Forms styling
3+
*/
4+
5+
button,
6+
[type="button"],
7+
[type="reset"],
8+
[type="submit"] {
9+
width: auto;
10+
}
11+
12+
textarea {
13+
resize: vertical;
14+
}
15+
16+
select {
17+
display: block;
18+
}
19+
20+
label {
21+
display: inline-block;
22+
line-height: 1;
23+
vertical-align: middle;
24+
}
25+
26+
input[type="text"],
27+
input[type="date"],
28+
input[type="email"],
29+
input[type="number"],
30+
input[type="password"],
31+
input[type="search"],
32+
input[type="tel"],
33+
input[type="url"],
34+
select,
35+
textarea {
36+
width: 100%;
37+
border: solid 1px #666666;
38+
border-radius: 3px;
39+
padding: 0.5rem 1rem; /* 8/16 *//* 16/16 */
40+
transition: all 300ms;
41+
42+
&:focus {
43+
border-color: #333333;
44+
outline: 0 none;
45+
}
46+
}
47+
48+
button,
49+
input {
50+
overflow: visible;
51+
}
52+
53+
button,
54+
select {
55+
text-transform: none;
56+
}
57+
58+
button,
59+
[type="button"],
60+
[type="submit"] {
61+
display: inline-block;
62+
font-weight: 400;
63+
color: $link-color;
64+
text-align: center;
65+
white-space: nowrap;
66+
user-select: none;
67+
background-color: transparent;
68+
border: 1px solid $link-color;
69+
padding: 0.5rem 1rem; /* 8/16 *//* 16/16 */
70+
font-size: 1rem; /* 16/16 */
71+
border-radius: 3px;
72+
transition: all 300ms;
73+
74+
&:focus {
75+
outline: 5px auto -webkit-focus-ring-color;
76+
}
77+
78+
&:hover {
79+
color: #ffffff;
80+
background-color: $link-hover-color;
81+
text-decoration: none;
82+
}
83+
84+
&:not(:disabled) {
85+
cursor: pointer;
86+
}
87+
}

‎assets/sass/generic/_list.scss‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/**
2+
* List styling
3+
*/
4+
dl, dt, dd, ol, ul, li {
5+
margin-top: 0;
6+
margin-bottom: 0;
7+
border: 0;
8+
outline: 0;
9+
font-size: 100%;
10+
vertical-align: baseline;
11+
background: transparent;
12+
}

0 commit comments

Comments
 (0)