diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-23 15:04:22 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-23 15:04:22 -0400 |
commit | 15f15de8ca5ee91e5d11ed017ba0e3d49b1471ec (patch) | |
tree | c410bad529a7d968a08e3b4e01cf3e9631eb47d1 /web/templates | |
parent | 301706f2558d55271275273dec0de1fb86082f8a (diff) | |
parent | e4a15076f458be1416de25b2c45578975b914de5 (diff) | |
download | chat-15f15de8ca5ee91e5d11ed017ba0e3d49b1471ec.tar.gz chat-15f15de8ca5ee91e5d11ed017ba0e3d49b1471ec.tar.bz2 chat-15f15de8ca5ee91e5d11ed017ba0e3d49b1471ec.zip |
Merge pull request #759 from mattermost/plt-242-3
PLT-242 Implement custom UI theme colors.
Diffstat (limited to 'web/templates')
-rw-r--r-- | web/templates/channel.html | 1 | ||||
-rw-r--r-- | web/templates/head.html | 2 |
2 files changed, 3 insertions, 0 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 a3ac930e9..bbd4c2f1a 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"> |