diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-23 12:55:58 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 12:55:58 -0700 |
| commit | 2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160 (patch) | |
| tree | d5bf8318dc82d96cd34b83481e1cc5c8289d170a /web/templates/head.html | |
| parent | 9e04909c0a3672d27c148c931d82b225cc86dfe5 (diff) | |
| parent | 0170cfe604e6cfb430be0b6181243ca85a9ab27b (diff) | |
| download | chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.tar.gz chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.tar.bz2 chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.zip | |
Merge branch 'master' into PLT-11-email
Diffstat (limited to 'web/templates/head.html')
| -rw-r--r-- | web/templates/head.html | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/web/templates/head.html b/web/templates/head.html index 39d5a262c..e1f2fe43f 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -25,10 +25,12 @@ <link rel="stylesheet" href="/static/css/bootstrap-3.3.5.min.css"> <link rel="stylesheet" href="/static/css/jasny-bootstrap.min.css" rel="stylesheet"> + <link rel="stylesheet" href="/static/css/bootstrap-colorpicker.min.css" rel="stylesheet"> <script src="/static/js/react-with-addons-0.13.3.js"></script> <script src="/static/js/jquery-1.11.1.js"></script> <script src="/static/js/bootstrap-3.3.5.js"></script> + <script src="/static/js/bootstrap-colorpicker.min.js"></script> <script src="/static/js/react-bootstrap-0.25.1.js"></script> <link id="favicon" rel="icon" href="/static/images/favicon.ico" type="image/x-icon"> @@ -40,11 +42,6 @@ <script src="/static/js/jquery-dragster/jquery.dragster.js"></script> - <script src="/static/js/emojify.min.js"></script> - <script> - emojify.setConfig({img_dir: '/static/images/emoji'}); - </script> - <style id="antiClickjack">body{display:none !important;}</style> <script src="/static/js/bundle.js"></script> <script type="text/javascript"> |