Skip to content

Commit 8555f79

Browse files
authored
Merge pull request #371 from understrap/develop
Release 1.2.0 Version
2 parents fa849f7 + dc24df4 commit 8555f79

File tree

188 files changed

+26242
-24682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+26242
-24682
lines changed

.gitignore

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,52 @@
1-
.sass-cache
1+
# ------------------------------------------------------------------------
2+
# This file specifies intentionally untracked files that Git should ignore
3+
# - https://git-scm.com/docs/gitignore
4+
# ------------------------------------------------------------------------
25

3-
bower_components
4-
5-
node_modules
6-
7-
understrap.zip
6+
# Numerous always-ignore extensions
7+
*.bak
8+
*.cvs
9+
*.db
10+
*.diff
11+
*.err
12+
*.log
13+
*.orig
14+
*.rej
15+
*.zip
816

9-
dist
17+
# Ignore all files and directories starting with . or ~ or ._ or ending with ~
18+
.*
19+
~*
20+
*~
21+
._*
22+
# but track
23+
!.babelrc.js
24+
!.browserslist
25+
!.editorconfig
26+
!.gitattributes
27+
!.github
28+
!.gitignore
1029

11-
dist-product
30+
# Ignore all files with .lock extentions
31+
*.lock
32+
# but track
33+
!composer.lock
1234

13-
npm-debug.log
35+
# OS or Editor files and folders
36+
*.code-workspace
37+
*.elc
38+
*.esproj
39+
*.komodoproject
40+
*.sublime*
41+
*.tmproj*
1442

43+
# Dependencies
44+
bower_components
45+
node_modules
1546
/vendor/
47+
48+
# Other Understrap specific files and directories
49+
phpcs.xml
50+
dist/
51+
dist-product/
52+
**/img

composer.json

Lines changed: 49 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,51 @@
11
{
2-
"name": "holger1411/understrap-child",
3-
"description": "Basic Child Theme for Understrap Theme Framework",
4-
"type": "library",
5-
"license": "GPL-2.0",
6-
"minimum-stability": "stable",
7-
"require": {},
8-
"keywords": ["wordpress","theme","bootstrap"],
9-
"homepage": "https://github.com/holger1411/understrap-child"
2+
"name": "understrap/understrap-child",
3+
"description": "Basic Child Starter Theme for Understrap",
4+
"type": "wordpress-theme",
5+
"license": "GPL-3.0",
6+
"minimum-stability": "stable",
7+
"keywords": [
8+
"wordpress",
9+
"theme",
10+
"bootstrap"
11+
],
12+
"homepage": "https://github.com/understrap/understrap-child",
13+
"authors": [
14+
{
15+
"name": "Contributors",
16+
"homepage": "https://github.com/understrap/understrap-child/contributors.md"
17+
}
18+
],
19+
"require": {
20+
"php": ">=5.6"
21+
},
22+
"require-dev": {
23+
"php-parallel-lint/php-parallel-lint": "^1.3.2",
24+
"phpcompatibility/phpcompatibility-wp": "^2.1.4",
25+
"phpmd/phpmd": "^2.13.0",
26+
"phpstan/phpstan": "^1.9.0",
27+
"roave/security-advisories": "dev-master",
28+
"squizlabs/php_codesniffer": "^3.7.1",
29+
"szepeviktor/phpstan-wordpress": "^1.1.3",
30+
"wp-coding-standards/wpcs": "^2.3.0",
31+
"wptrt/wpthemereview": "^0.2.1"
32+
},
33+
"scripts": {
34+
"php-lint": "@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint --exclude vendor --exclude node_modules --exclude dist --exclude .git --exclude .phpstan-cache .",
35+
"phpcs": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs -p",
36+
"phpcs-ga": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs -n --report=checkstyle",
37+
"phpcs-fix": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf",
38+
"phpcs-config-set" : "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --config-set installed_paths ../../phpcompatibility/php-compatibility,../../phpcompatibility/phpcompatibility-paragonie,../../phpcompatibility/phpcompatibility-wp,../../wp-coding-standards/wpcs,../../wptrt/wpthemereview",
39+
"phpmd": "@php ./vendor/phpmd/phpmd/src/bin/phpmd . ansi phpmd.xml",
40+
"phpmd-baseline": "@phpmd -- --generate-baseline",
41+
"phpmd-ga": "@php ./vendor/phpmd/phpmd/src/bin/phpmd . github phpmd.xml",
42+
"phpstan": "@php ./vendor/phpstan/phpstan/phpstan analyse -a src/phpstan/autoload.php",
43+
"phpstan-baseline": "@php ./vendor/phpstan/phpstan/phpstan analyse -a src/phpstan/autoload.php --generate-baseline",
44+
"post-install-cmd": "@phpcs-config-set",
45+
"post-update-cmd": "@phpcs-config-set"
46+
},
47+
"support": {
48+
"issues": "https://github.com/understrap/understrap/issues",
49+
"source": "https://github.com/understrap/understrap"
50+
}
1051
}

0 commit comments

Comments
 (0)