From 4cc87db89f8d45c99b3a8c8c44bc1b9506e94e11 Mon Sep 17 00:00:00 2001
From: Seivan Heidari <seivan.heidari@icloud.com>
Date: Thu, 6 Apr 2017 09:50:37 +0200
Subject: [PATCH 1/3] Update install.md (#1398)

---
 docs/app/components/layout/install/install.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/app/components/layout/install/install.md b/docs/app/components/layout/install/install.md
index 07662def..716ecf92 100644
--- a/docs/app/components/layout/install/install.md
+++ b/docs/app/components/layout/install/install.md
@@ -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:
 

From 991a430ca22f905e12556def4bba27872e445514 Mon Sep 17 00:00:00 2001
From: priecint <priecint@users.noreply.github.com>
Date: Thu, 6 Apr 2017 09:52:54 +0200
Subject: [PATCH 2/3] Fix TableCell definition (#1386)

As per source (https://github.com/react-toolbox/react-toolbox/blob/dev/components/table/TableCell.js#L7) `sorted` accepts lower-case strings but the TypeScript definition uses upper-case. So there is either error from TS (`TS2322:Type 'string' is not assignable to type '"ASC" | "DESC"'`) or React (`Warning: Failed prop type: Invalid prop `sorted` of value `ASC` supplied to `ThemedTableCell`, expected one of ["asc","desc"].`).
---
 components/table/TableCell.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/table/TableCell.d.ts b/components/table/TableCell.d.ts
index 02f73458..208760cd 100644
--- a/components/table/TableCell.d.ts
+++ b/components/table/TableCell.d.ts
@@ -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'

From ade338f903f527634e2549927f8a10d65a7f4de1 Mon Sep 17 00:00:00 2001
From: Kiko Beats <josefrancisco.verdu@gmail.com>
Date: Thu, 6 Apr 2017 09:53:55 +0200
Subject: [PATCH 3/3] Add npm pretest script (#1396)

Instead of run linter just for travis build, run it in each local testing execution
---
 .travis.yml  | 4 ----
 package.json | 7 ++++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 32f6e047..41fbc439 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,3 @@ language: node_js
 node_js:
   - 6
   - 4
-  
-script:
-  - npm run lint
-  - npm test
diff --git a/package.json b/package.json
index febe84d5..73901939 100644
--- a/package.json
+++ b/package.json
@@ -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": "node --harmony_proxies node_modules/.bin/jest --maxWorkers 4",
@@ -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"
     ],