From ae8e9c3dfd0f8606064f29d56141b0b3fe35cdef Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 11 Sep 2015 11:41:16 +0500
Subject: Updating UI for modals and notification bar

---
 web/templates/channel.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web/templates')

diff --git a/web/templates/channel.html b/web/templates/channel.html
index 9bfd1fa35..a732a25ce 100644
--- a/web/templates/channel.html
+++ b/web/templates/channel.html
@@ -52,6 +52,7 @@
 <script>
   window.setup_channel_page('{{ .Props.TeamDisplayName }}', '{{ .Props.TeamType }}', '{{ .Props.TeamId }}', '{{ .Props.ChannelName }}', '{{ .Props.ChannelId }}');
   $('body').tooltip( {selector: '[data-toggle=tooltip]'} );
+  $('.modal-body').css('max-height', $(window).height() * 0.7);
   $('.modal-body').perfectScrollbar();
 </script>
 </body>
-- 
cgit v1.2.3-1-g7c22


From 0ea0233c50dbccc498cb53481b9fdf18d027e5b2 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Mon, 14 Sep 2015 13:56:58 -0400
Subject: New add channel modal using react-bootstrap.

---
 web/templates/head.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'web/templates')

diff --git a/web/templates/head.html b/web/templates/head.html
index 76ee70ced..55c729476 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -18,12 +18,13 @@
     <link rel="manifest" href="/static/config/manifest.json">
     <!-- Android add to homescreen -->
 
-    <link rel="stylesheet" href="/static/css/bootstrap-3.3.1.min.css">
+    <link rel="stylesheet" href="/static/css/bootstrap-3.3.5.min.css">
     <link rel="stylesheet" href="/static/css/jasny-bootstrap.min.css" rel="stylesheet">
 
-    <script src="/static/js/react-with-addons-0.13.1.js"></script>
+    <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.1.js"></script>
+    <script src="/static/js/bootstrap-3.3.5.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">
     <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon">
-- 
cgit v1.2.3-1-g7c22