diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-30 09:35:00 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-30 09:35:00 -0400 |
| commit | 2e9f5c7cf052cea3db10ec200a6736e6cbc880a3 (patch) | |
| tree | c1df3ed00b64df029da6239d44762bf5995dc031 /webapp/sass/styles.scss | |
| parent | 52cef6bc41d39a1eef1cc9f26ef46262c31cd66a (diff) | |
| parent | 55ce37be4eea971e532fec896ff0d6bfed765534 (diff) | |
| download | chat-2e9f5c7cf052cea3db10ec200a6736e6cbc880a3.tar.gz chat-2e9f5c7cf052cea3db10ec200a6736e6cbc880a3.tar.bz2 chat-2e9f5c7cf052cea3db10ec200a6736e6cbc880a3.zip | |
Merge pull request #2567 from mattermost/css-webpack-improvments
Moving from scss vendors folder to NPM.
Diffstat (limited to 'webapp/sass/styles.scss')
| -rw-r--r-- | webapp/sass/styles.scss | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/webapp/sass/styles.scss b/webapp/sass/styles.scss index 103c0a700..67e62d023 100644 --- a/webapp/sass/styles.scss +++ b/webapp/sass/styles.scss @@ -3,8 +3,14 @@ @import 'compass/utilities'; @import 'compass/css3'; +// Dependancies +@import '~bootstrap/dist/css/bootstrap.css'; +@import '~jasny-bootstrap/dist/css/jasny-bootstrap.css'; +@import '~perfect-scrollbar/dist/css/perfect-scrollbar.css'; +@import '~font-awesome/css/font-awesome.css'; +@import '~bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css'; + // styles.scss -@import 'vendors/module'; @import 'utils/module'; @import 'base/module'; @import 'routes/module'; |