From e4a15076f458be1416de25b2c45578975b914de5 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Wed, 23 Sep 2015 10:12:40 -0400
Subject: Implement UI theme colors.

---
 web/templates/channel.html | 1 +
 web/templates/head.html    | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'web/templates')

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 af5c86bba..36af56a21 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">
-- 
cgit v1.2.3-1-g7c22