From 4d2db9310638c378deef9148bc856046fc424897 Mon Sep 17 00:00:00 2001
From: gagan.deep <gagan.deep@ebix.com>
Date: Tue, 27 Feb 2018 13:17:05 +0530
Subject: [PATCH] Merge Code

---
 400-SOURCECODE/Admin/dist/assets/styles/admin-custom.css   | 10 ++++++++++
 400-SOURCECODE/Admin/dist/assets/styles/fixed_table_rc.css | 15 +++++++++++++--
 400-SOURCECODE/Admin/dist/index.html                       |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/400-SOURCECODE/Admin/dist/assets/styles/admin-custom.css b/400-SOURCECODE/Admin/dist/assets/styles/admin-custom.css
index 75bc717..1d3e218 100644
--- a/400-SOURCECODE/Admin/dist/assets/styles/admin-custom.css
+++ b/400-SOURCECODE/Admin/dist/assets/styles/admin-custom.css
@@ -169,6 +169,16 @@
   color: #FDFBFB;
 }
 
+#tblLicenseUserGroups > tbody > tr.active > td {
+  background: #726D6D;
+  color: #FDFBFB;
+}
+
+#tblLicenseUserGroups > tbody > tr.inactive > td {
+  background: #FDFBFB;
+  color: #726D6D;
+}
+
 
 
 /*30-1-2017*/
diff --git a/400-SOURCECODE/Admin/dist/assets/styles/fixed_table_rc.css b/400-SOURCECODE/Admin/dist/assets/styles/fixed_table_rc.css
index cc9c40c..c6622ca 100644
--- a/400-SOURCECODE/Admin/dist/assets/styles/fixed_table_rc.css
+++ b/400-SOURCECODE/Admin/dist/assets/styles/fixed_table_rc.css
@@ -4,8 +4,19 @@
 .ft_container table tr th {	font-weight: bold; background: #0095da; color: #fff; }
 
 .ft_container table thead { -moz-user-select: none;-webkit-user-select: none;}
-.ft_container table tr th, 
-.ft_container table tr td { border-collapse: collapse; padding: 5px 4px; border: 1px solid #CCCCCC; border-top-width: 0px; border-left-width: 0px; border-right-width: 1px; border-bottom-width: 1px; overflow:hidden; word-wrap: break-word;}
+  .ft_container table tr th,
+  .ft_container table tr td {
+    border-collapse: collapse;
+    padding: 5px 4px;
+    border: 1px solid #CCCCCC;
+    border-top-width: 0px;
+    border-left-width: 0px;
+    border-right-width: 1px;
+    border-bottom-width: 1px;
+    overflow: hidden;
+    word-wrap: break-word;
+    word-break: break-all;
+  }
 
 .ft_container table tr:first-child td,  
 .ft_container table tr:first-child th { border-top-width: 1px; border-color: #CCCCCC; }
diff --git a/400-SOURCECODE/Admin/dist/index.html b/400-SOURCECODE/Admin/dist/index.html
index c982774..bec0362 100644
--- a/400-SOURCECODE/Admin/dist/index.html
+++ b/400-SOURCECODE/Admin/dist/index.html
@@ -37,4 +37,4 @@
       //});
     });</script><!--Nav--><script>$('.modal').draggable({
       handle: '.modal-header'
-    })</script><script type="text/javascript" src="inline.72c9e2de3e55105c986b.bundle.js"></script><script type="text/javascript" src="polyfills.35726d60cdf25fecc5f1.bundle.js"></script><script type="text/javascript" src="vendor.a409cb1c2d64015b0bed.bundle.js"></script><script type="text/javascript" src="main.2e3e428a647ac019f929.bundle.js"></script></body></html>
\ No newline at end of file
+    })</script><script type="text/javascript" src="inline.f16c8ee22b66f4020196.bundle.js"></script><script type="text/javascript" src="polyfills.7aa50cbe20bd7fe85b7a.bundle.js"></script><script type="text/javascript" src="vendor.a6d1f5c67dd379dfc0eb.bundle.js"></script><script type="text/javascript" src="main.57c38f54cf26e6587d7a.bundle.js"></script></body></html>
\ No newline at end of file
--
libgit2 0.21.4