Skip to content

Commit 93dc044

Browse files
authored
Merge pull request #45 from liip/show-bg-color-in-editor
Show bg color in editor
2 parents 6971645 + ed7c054 commit 93dc044

Some content is hidden

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

41 files changed

+3022
-2789
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ vendor
33
build/*
44
!build/index.js
55
!build/index.asset.php
6-
!build/editor.css
7-
!build/style.css
6+
!build/index.css
7+
!build/style-index.css
88
wp-cli.phar
99
composer.phar
1010
/wordpress

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ services:
99
env:
1010
global:
1111
- secure: pTuC5XVCyo85IzE2pCulnvmsrUA6UicQH+lo2t7x7h+cJQP4YThEI8CE64L1cbH8aBby2+7mZfKvXJTEsLN4FOclY0WzIu8kncRtXmnSysM8cwXSx6ly9Ro3E1JWjT9W7BrWoE6tOMMmv5f0FKTw6b4Rwlv9sFICEERdCIcI6mrRORWwcznoMs2Pg8d0BkZsOm7gcJ7QRL+lfw72fqb8+jCaatzO9WjeUPq5txueVntgaBG+R4Pt6WNHdFPIvYjN7onos9Mw+xeZqZmubG/htTne1ZPQTX7KeI68Hic4rxGEC5eGvXOZoUxfmpoJyoBYb3uPPxWkvsSmgqEMEbTFwtXvLqOkaLXrypGZfksP+yMuBF337uwz8/7eFanYjSsY8qRHDCbQ7xQOboTZyp+soKqQStr6dfLcwsF8v5nRnLBvTBzbgSgCK81SeStH4VcumJoVvWEKPTNx4yRvSK+7W9JuHajR6EXA1YZs0jyfOXM8oDRWaP45CRbu6cKtF+YZykOXYUV8/ZCcFjixmd04VO8M31vnuHN5nF+45JtWkhW2wL62y+x3czc8mMKemhGoCPdR2V+iE38aQ8uHPzyp0dtoXsEBiaypV/c8CvYryirKqGnvNIhmOwgg7k04L5yULkRJlEw27SRnTTyNJ3Dv9NJ+9A7bX4utZcOiSxkohdM=
12-
- WP_DEVELOP_DIR: ./wordpress
1312
- PHP_FPM_UID: 2000
1413
- PHP_FPM_GID: 2000
1514

@@ -19,13 +18,13 @@ before_install:
1918
install:
2019
- composer install
2120
- npm ci
22-
- scripts/install-wp.sh
21+
- npm run wp-env start
2322

2423
script:
2524
- npm run lint
26-
- npm run env lint-php
25+
- npm run lint:php
2726
- npm run test:e2e
28-
- npm run env test-php
27+
- npm run test:unit:php:ci
2928

3029
deploy:
3130
provider: script

.wp-env.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"core": "WordPress/WordPress",
3+
"plugins": [ "." ],
4+
"mappings": {
5+
"wp-content/plugins/wp-bootstrap-blocks-test-plugins": "./e2e-tests/plugins"
6+
}
7+
}

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This plugin adds Bootstrap components and layout options as Gutenberg blocks.
3030
* Sizes for all breakpoints (xl, lg, md, sm, xs): How much space the column should use for the given breakpoint.
3131
* Equal width for all breakpoints (xl, lg, md, sm, xs): If enabled column will spread width evenly with other columns.
3232
* Background Color: Set background color to column.
33-
* Center content: Center content vertically in column. This option is only needed if a background color is set. Otherwise use the **Alignment** option of the otuer `row` block.
33+
* Center content: Center content vertically in column. This option is only needed if a background color is set. Otherwise use the **Alignment** option of the outer `row` block.
3434
* Padding: Define padding inside the column.
3535

3636
### Button
@@ -49,7 +49,7 @@ This plugin adds Bootstrap components and layout options as Gutenberg blocks.
4949

5050
## Bootstrap library
5151

52-
Please be aware that this plugin does not include the Bootstrap library in your website. You need to do this for yourself.
52+
Please be aware that this plugin does not include the Bootstrap library in your website. You need to do this by yourself.
5353
We decided not to include the library so that you can modify Bootstrap to your own needs before loading it.
5454

5555
The easiest way to do this is to add the following to your theme's `function.php`:
@@ -591,8 +591,8 @@ php wp-cli.phar i18n make-pot --exclude="wordpress" . languages/wp-bootstrap-blo
591591
The following commands can be used to setup a local dev environment. See the official [documentation of `@wordpress/scripts`](https://developer.wordpress.org/block-editor/packages/packages-scripts/#available-sub-scripts) for a complete list of commands.
592592

593593
* `scripts/install-wp.sh [wp-version]`: Install local WordPress environment
594-
* `npm run env start`: Starts the Docker containers.
595-
* `npm run env stop`: Stops the Docker containers.
594+
* `npm run wp-env start`: Starts the Docker containers.
595+
* `npm run wp-env stop`: Stops the Docker containers.
596596

597597
### Testing
598598

@@ -616,13 +616,13 @@ This file gets automatically generated if the test runs for the first time and t
616616
To run the tests use the following command:
617617

618618
```bash
619-
npm run env test-php
619+
npm run test:unit:php
620620
```
621621

622622
or the following command to run a specific test:
623623

624624
```bash
625-
npm run env test-php -- --filter 'my_test'
625+
npm run test:unit:php -- --filter 'my_test'
626626
```
627627

628628
#### Puppeteer E2E Tests

build/editor.css

Lines changed: 0 additions & 2 deletions
This file was deleted.

build/index.asset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => '8abd10a9ebae5707ce70cf31f11dedee');
1+
<?php return array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => '130d186358a29f9f3f810962654c962a');

build/index.css

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
},
2626
"require-dev": {
2727
"squizlabs/php_codesniffer": "^3.5",
28-
"wp-coding-standards/wpcs": "^2.2",
29-
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2"
28+
"wp-coding-standards/wpcs": "^2.3",
29+
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2",
30+
"wp-phpunit/wp-phpunit": "^5.4"
3031
},
3132
"scripts": {
3233
"lint": "phpcs --standard=phpcs.xml"

0 commit comments

Comments
 (0)