summaryrefslogtreecommitdiffstats
path: root/webapp/root.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-03-17 08:36:53 -0400
committerChristopher Speller <crspeller@gmail.com>2016-03-17 08:36:53 -0400
commitbe07d634645ac1f095f7d4bec182a604075c6138 (patch)
tree8d2f59791d2d418b93e4fff227fef2405be7dfd0 /webapp/root.jsx
parentcba59d4eb6ef0f65304bc72339c676ebfd653e2b (diff)
parent64321f88f358e23489559d675b9194f856c0175c (diff)
downloadchat-be07d634645ac1f095f7d4bec182a604075c6138.tar.gz
chat-be07d634645ac1f095f7d4bec182a604075c6138.tar.bz2
chat-be07d634645ac1f095f7d4bec182a604075c6138.zip
Merge pull request #2448 from asaadmahmoodspin/ui-improvements
Updating sass lint stuff with other scss improvements
Diffstat (limited to 'webapp/root.jsx')
-rw-r--r--webapp/root.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/root.jsx b/webapp/root.jsx
index 8ebe51bd2..2ce220f1d 100644
--- a/webapp/root.jsx
+++ b/webapp/root.jsx
@@ -3,11 +3,11 @@
import $ from 'jquery';
-import 'sass/styles.scss';
import 'bootstrap/dist/css/bootstrap.css';
import 'jasny-bootstrap/dist/css/jasny-bootstrap.css';
import 'bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css';
import 'google-fonts/google-fonts.css';
+import 'sass/styles.scss';
import React from 'react';
import ReactDOM from 'react-dom';