summaryrefslogtreecommitdiffstats
path: root/web/react/pages/channel.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2015-09-23 15:04:22 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2015-09-23 15:04:22 -0400
commit15f15de8ca5ee91e5d11ed017ba0e3d49b1471ec (patch)
treec410bad529a7d968a08e3b4e01cf3e9631eb47d1 /web/react/pages/channel.jsx
parent301706f2558d55271275273dec0de1fb86082f8a (diff)
parente4a15076f458be1416de25b2c45578975b914de5 (diff)
downloadchat-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/react/pages/channel.jsx')
-rw-r--r--web/react/pages/channel.jsx6
1 files changed, 6 insertions, 0 deletions
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index d24fe0b98..07207c556 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -34,6 +34,7 @@ var ActivityLogModal = require('../components/activity_log_modal.jsx');
var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx');
var FileUploadOverlay = require('../components/file_upload_overlay.jsx');
var RegisterAppModal = require('../components/register_app_modal.jsx');
+var ImportThemeModal = require('../components/user_settings/import_theme_modal.jsx');
var Constants = require('../utils/constants.jsx');
var ActionTypes = Constants.ActionTypes;
@@ -85,6 +86,11 @@ function setupChannelPage(props) {
);
React.render(
+ <ImportThemeModal />,
+ document.getElementById('import_theme_modal')
+ );
+
+ React.render(
<TeamSettingsModal teamDisplayName={props.TeamDisplayName} />,
document.getElementById('team_settings_modal')
);