Skip to content

Commit 6eec84f

Browse files
committed
Merge branch 'master' into v1.7-dev
2 parents a7646b7 + b144261 commit 6eec84f

File tree

13 files changed

+461
-700
lines changed

13 files changed

+461
-700
lines changed

.scss-lint.yml

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

.stylelintrc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
extends:
2+
- stylelint-config-takiyon

.travis.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
language: node_js
22
node_js:
3-
- '8'
43
- '10'
54
- '12'
6-
before_script:
7-
# Remove ./node_modules/.bin from PATH so node-which doesn't replace Unix which and cause RVM to barf. See https://github.com/travis-ci/travis-ci/issues/5092
8-
- PATH=${PATH//:\.\/node_modules\/\.bin/}
9-
- rvm install ruby --latest
10-
- gem install sass scss_lint
5+
- '13'
116
script:
127
- npm run build

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
[![npm](https://img.shields.io/npm/v/react-checkbox-tree.svg?style=flat-square)](https://www.npmjs.com/package/react-checkbox-tree)
44
[![Build Status](https://img.shields.io/travis/jakezatecky/react-checkbox-tree/master.svg?style=flat-square)](https://travis-ci.org/jakezatecky/react-checkbox-tree)
5-
[![Dependency Status](https://img.shields.io/david/jakezatecky/react-checkbox-tree.svg?style=flat-square)](https://david-dm.org/jakezatecky/react-checkbox-tree)
6-
[![devDependency Status](https://david-dm.org/jakezatecky/react-checkbox-tree/dev-status.svg?style=flat-square)](https://david-dm.org/jakezatecky/react-checkbox-tree?type=dev)
7-
[![Greenkeeper badge](https://badges.greenkeeper.io/jakezatecky/react-checkbox-tree.svg?style=flat-square)](https://greenkeeper.io/)
85
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://raw.githubusercontent.com/jakezatecky/react-checkbox-tree/master/LICENSE.txt)
96

107
> A simple and elegant checkbox tree for React.
@@ -143,7 +140,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
143140
| Property | Type | Description | Default |
144141
| -------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------- | ----------- |
145142
| `nodes` | array | **Required**. Specifies the tree nodes and their children. | |
146-
| `checkModel` | bool | Specifies which checked nodes should be stored in the `checked` array. Accepts `'leaf'` or `'all'`. | `'leaf'` |
143+
| `checkModel` | string | Specifies which checked nodes should be stored in the `checked` array. Accepts `'leaf'` or `'all'`. | `'leaf'` |
147144
| `checked` | array | An array of checked node values. | `[]` |
148145
| `direction` | string | A string that specify whether the direction of the component is left-to-right (`'ltr'`) or right-to-left (`'rtl'`). | `'ltr'` |
149146
| `disabled` | bool | If true, the component will be disabled and nodes cannot be checked. | `false` |

examples/README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
# Examples
22

33
1. Clone this repo
4-
2. Install [Ruby][ruby]
5-
3. Run `gem install sass scss_lint`
6-
4. Run `npm install`
7-
5. Start the server with `npm run examples`
8-
9-
[ruby]: https://www.ruby-lang.org/en/downloads/
4+
2. Start the server with `npm run examples`

0 commit comments

Comments
 (0)