Skip to content

Commit

Permalink
Updating client dependancies except ESLint and react-router (mattermo…
Browse files Browse the repository at this point in the history
  • Loading branch information
crspeller committed Feb 3, 2017
1 parent 779b233 commit 027d91d
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion dispatcher/app_dispatcher.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ const AppDispatcher = Object.assign(new Flux.Dispatcher(), {
}
});

module.exports = AppDispatcher;
export default AppDispatcher;
74 changes: 37 additions & 37 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,73 +3,73 @@
"version": "0.0.1",
"private": true,
"dependencies": {
"autolinker": "1.2.1",
"autolinker": "1.4.0",
"bootstrap": "3.3.7",
"bootstrap-colorpicker": "2.3.6",
"chart.js": "2.4.0",
"compass-mixins": "0.12.10",
"fastclick": "1.0.6",
"flux": "3.1.0",
"flux": "3.1.2",
"font-awesome": "4.7.0",
"highlight.js": "9.8.0",
"highlight.js": "9.9.0",
"inobounce": "0.1.4",
"intl": "1.2.5",
"jasny-bootstrap": "3.1.3",
"jquery": "3.1.1",
"marked": "mattermost/marked#328857681dcc98a3d75633d6c0effa7c29b6cceb",
"match-at": "0.1.0",
"object-assign": "4.1.0",
"pdfjs-dist": "1.6.319",
"perfect-scrollbar": "0.6.14",
"react": "15.4.0",
"react-addons-pure-render-mixin": "15.4.0",
"react-bootstrap": "0.30.6",
"react-custom-scrollbars": "4.0.0",
"react-dom": "15.4.0",
"react-intl": "2.1.5",
"object-assign": "4.1.1",
"pdfjs-dist": "1.7.235",
"perfect-scrollbar": "0.6.16",
"react": "15.4.2",
"react-addons-pure-render-mixin": "15.4.2",
"react-bootstrap": "0.30.7",
"react-custom-scrollbars": "4.0.1",
"react-dom": "15.4.2",
"react-intl": "2.2.3",
"react-router": "2.8.1",
"react-select": "1.0.0-rc.2",
"superagent": "2.3.0",
"twemoji": "2.2.0",
"velocity-animate": "1.3.1",
"webrtc-adapter": "2.1.0",
"react-select": "1.0.0-rc.3",
"superagent": "3.4.1",
"twemoji": "2.2.3",
"velocity-animate": "1.4.2",
"webrtc-adapter": "3.1.0",
"xregexp": "3.1.1"
},
"devDependencies": {
"babel-core": "6.18.2",
"babel-core": "6.22.1",
"babel-eslint": "7.1.0",
"babel-loader": "6.2.7",
"babel-plugin-transform-runtime": "6.15.0",
"babel-polyfill": "6.16.0",
"babel-preset-es2015": "6.18.0",
"babel-preset-react": "6.16.0",
"babel-preset-stage-0": "6.16.0",
"babel-loader": "6.2.10",
"babel-plugin-transform-runtime": "6.22.0",
"babel-polyfill": "6.22.0",
"babel-preset-es2015": "6.22.0",
"babel-preset-react": "6.22.0",
"babel-preset-stage-0": "6.22.0",
"copy-webpack-plugin": "4.0.1",
"cross-env": "3.1.3",
"css-loader": "0.25.0",
"cross-env": "3.1.4",
"css-loader": "0.26.1",
"eslint": "3.10.2",
"eslint-plugin-react": "6.7.1",
"exports-loader": "0.6.3",
"extract-text-webpack-plugin": "1.0.1",
"file-loader": "0.9.0",
"file-loader": "0.10.0",
"html-loader": "0.4.4",
"html-webpack-plugin": "2.24.1",
"image-webpack-loader": "2.0.0",
"imports-loader": "0.6.5",
"html-webpack-plugin": "2.28.0",
"image-webpack-loader": "3.2.0",
"imports-loader": "0.7.0",
"jquery-deferred": "0.3.1",
"jsdom": "9.8.3",
"jsdom-global": "2.1.0",
"jsdom": "9.9.1",
"jsdom-global": "2.1.1",
"json-loader": "0.5.4",
"mocha": "3.1.2",
"mocha": "3.2.0",
"mocha-jsdom": "1.1.0",
"mocha-webpack": "0.7.0",
"node-sass": "3.13.0",
"node-sass": "4.5.0",
"raw-loader": "0.5.1",
"react-addons-test-utils": "15.4.0",
"sass-loader": "4.0.2",
"react-addons-test-utils": "15.4.2",
"sass-loader": "4.1.1",
"style-loader": "0.13.1",
"url-loader": "0.5.7",
"webpack": "2.1.0-beta.27",
"webpack": "2.2.1",
"webpack-node-externals": "1.5.4"
},
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions sass/routes/_backstage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -405,12 +405,12 @@
width: 15%;
}

&.emoji-list__creator {
.emoji-list__creator {
padding: 15px 0px;
width: 40%;
}

&.emoji-list__actions {
.emoji-list__actions {
padding: 20px 15px 20px 0px;
width: 15%;
}
Expand Down Expand Up @@ -438,4 +438,4 @@
.emoticon {
margin-bottom: 0;
}
}
}

0 comments on commit 027d91d

Please sign in to comment.