diff options
Diffstat (limited to 'web/templates')
-rw-r--r-- | web/templates/channel.html | 1 | ||||
-rw-r--r-- | web/templates/head.html | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/web/templates/channel.html b/web/templates/channel.html index 92aaaf02f..2af94e415 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -29,6 +29,7 @@ <div id="edit_mention_tab"></div> <div id="get_link_modal"></div> <div id="user_settings_modal"></div> + <div id="import_theme_modal"></div> <div id="team_settings_modal"></div> <div id="invite_member_modal"></div> <div id="edit_channel_modal"></div> 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"> |