Merge branch 'dev' into travis-node

old
Javi Velasco 2017-04-06 09:56:00 +02:00 committed by GitHub
commit 11634571d1
4 changed files with 6 additions and 9 deletions

View File

@ -5,7 +5,3 @@ language: node_js
node_js:
- "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

@ -104,6 +104,7 @@
"patch": "bumped release patch",
"prebuild": "npm run clean",
"prepublish": "npm run build",
"pretest": "npm run lint",
"release": "bumped release",
"start": "cross-env NODE_ENV=development UV_THREADPOOL_SIZE=100 node ./server",
"test": "jest",
@ -112,15 +113,15 @@
},
"license": "MIT",
"jest": {
"modulePaths": [
"<rootDir>"
],
"moduleDirectories": [
"node_modules"
],
"moduleNameMapper": {
"(\\.css$)|(normalize.css/normalize)|(^exports-loader)": "identity-obj-proxy"
},
"modulePaths": [
"<rootDir>"
],
"setupFiles": [
"./jest.config.js"
],