Merge branch 'dev' into patch-1

old
Kiko Beats 2017-04-06 10:16:05 +02:00
commit 50049275d5
No known key found for this signature in database
GPG Key ID: 8FA93B22CCF04B96
5 changed files with 14 additions and 11 deletions

2
.nvmrc
View File

@ -1 +1 @@
4.4.3
6.9.2

View File

@ -3,9 +3,9 @@ sudo: false
language: node_js
node_js:
- 6
- 4
- "node"
- "lts/*"
script:
- npm run lint
- npm test

View File

@ -53,7 +53,7 @@ export interface TableCellProps extends ReactToolbox.Props {
/**
* If you provide a value the cell will show an arrow pointing down or up depending on the value to indicate it is a sorted element. Useful only for columns.
*/
sorted?: 'ASC' | 'DESC';
sorted?: 'asc' | 'desc';
/**
* The element tag, either `td` or `th`.
* @default 'td'

View File

@ -97,7 +97,7 @@ If the component has no styles injected, you should provide a theme object imple
## Theming
You can afford theming in multiple ways. First of all, you have to understand that React Toolbox stylesheets are written in SASS and configured using the **config** files we saw earlier. Also you may want to check [colors](https://github.com/react-toolbox/react-toolbox/blob/dev/components/_colors.scss) and [globals](https://github.com/react-toolbox/react-toolbox/blob/dev/components/_globals.scss) files to get an overview on the **variables** you have to override to get the results you want.
You can afford theming in multiple ways. First of all, you have to understand that React Toolbox stylesheets are written in SASS and configured using the **config** files we saw earlier. Also you may want to check [colors](https://github.com/react-toolbox/react-toolbox/blob/dev/components/colors.css) and [variables](https://github.com/react-toolbox/react-toolbox/blob/dev/components/variables.css) files to get an overview on the **variables** you have to override to get the results you want.
In most scenarios you can get more customized themes by overriding those variables and compiling stylesheets with them. For example, you can create a `_theme.scss` SASS file:

View File

@ -92,6 +92,9 @@
"webpack-dev-middleware": "^1.10.0",
"webpack-hot-middleware": "^2.16.1"
},
"engines": {
"node": ">= 6"
},
"scripts": {
"babel": "babel ./components --out-dir ./lib",
"build": "cross-env NODE_ENV=production gulp && npm run tsd",
@ -106,21 +109,21 @@
"prepublish": "npm run build",
"release": "bumped release",
"start": "cross-env NODE_ENV=development UV_THREADPOOL_SIZE=100 node ./server",
"test": "node --harmony_proxies node_modules/.bin/jest --maxWorkers 4",
"test:watch": "node --harmony_proxies node_modules/.bin/jest --watch --no-watchman",
"test": "jest",
"test:watch": "jest --watch --no-watchman",
"tsd": "cpx \"./components/**/*.d.ts\" ./lib"
},
"license": "MIT",
"jest": {
"modulePaths": [
"<rootDir>"
],
"moduleDirectories": [
"node_modules"
],
"moduleNameMapper": {
"(\\.css$)|(normalize.css/normalize)|(^exports-loader)": "identity-obj-proxy"
},
"modulePaths": [
"<rootDir>"
],
"setupFiles": [
"./jest.config.js"
],