Skip to content

Commit 1163457

Browse files
authored
Merge branch 'dev' into travis-node
2 parents fdd7873 + ade338f commit 1163457

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,3 @@ language: node_js
55
node_js:
66
- "node"
77
- "lts/*"
8-
9-
script:
10-
- npm run lint
11-
- npm test

components/table/TableCell.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export interface TableCellProps extends ReactToolbox.Props {
5353
/**
5454
* 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.
5555
*/
56-
sorted?: 'ASC' | 'DESC';
56+
sorted?: 'asc' | 'desc';
5757
/**
5858
* The element tag, either `td` or `th`.
5959
* @default 'td'

docs/app/components/layout/install/install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ If the component has no styles injected, you should provide a theme object imple
9797

9898
## Theming
9999

100-
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.
100+
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.
101101

102102
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:
103103

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
"patch": "bumped release patch",
105105
"prebuild": "npm run clean",
106106
"prepublish": "npm run build",
107+
"pretest": "npm run lint",
107108
"release": "bumped release",
108109
"start": "cross-env NODE_ENV=development UV_THREADPOOL_SIZE=100 node ./server",
109110
"test": "jest",
@@ -112,15 +113,15 @@
112113
},
113114
"license": "MIT",
114115
"jest": {
115-
"modulePaths": [
116-
"<rootDir>"
117-
],
118116
"moduleDirectories": [
119117
"node_modules"
120118
],
121119
"moduleNameMapper": {
122120
"(\\.css$)|(normalize.css/normalize)|(^exports-loader)": "identity-obj-proxy"
123121
},
122+
"modulePaths": [
123+
"<rootDir>"
124+
],
124125
"setupFiles": [
125126
"./jest.config.js"
126127
],

0 commit comments

Comments
 (0)