diff --git a/app/Views/drive_file_upload.php b/app/Views/drive_file_upload.php index 1587afa1..db20f6d4 100644 --- a/app/Views/drive_file_upload.php +++ b/app/Views/drive_file_upload.php @@ -36,7 +36,8 @@ -
| S.No | @@ -62,6 +63,7 @@ + diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php index 76bbdc73..dd0c7b33 100644 --- a/app/Views/hr_file_upload.php +++ b/app/Views/hr_file_upload.php @@ -356,11 +356,7 @@ // for datatable $(document).ready(function() { $('#hr_tickets_table').DataTable({ -<<<<<<< HEAD dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + -======= - dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + ->>>>>>> 3e7d3426 (FIX_XL button and Search) "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", buttons: [{ diff --git a/app/Views/insurer_list.php b/app/Views/insurer_list.php index 9bb6624b..59727f76 100755 --- a/app/Views/insurer_list.php +++ b/app/Views/insurer_list.php @@ -217,23 +217,8 @@ `, searchPlaceholder: "Search" ->>>>>>> 3e7d3426 (FIX_XL button and Search) }, - { - text: 'ADD', - className: 'btn btn-color', - action: function() { - window.location.href = "= base_url("master/insurer/create"); ?>"; - } - } - ], - - - language: { - search: "_INPUT_", - searchPlaceholder: "Search..." - }, - paging: true, + paging: true, }); }) diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 81e90196..4d7a406e 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -714,7 +714,7 @@ border-bottom: 2px solid #C3EDEE !important; font-weight: 400 !important; } - + table[data-custom-table-css="table"] thead th:first-child, table[data-custom-table-css="second-table"] thead th:first-child { border-top-left-radius: 15px !important; @@ -765,7 +765,7 @@ background: #FFFFFF !important; padding: 12px; border-top: 0px solid #fff !important; - border-bottom: 2px solid #F5FFFF !important; + border-bottom: 2px solid #F0F0F0 !important; font-weight: 400 !important; } @@ -780,7 +780,7 @@ border-radius: 13px !important; border: none !important; } - + /* Previous / Next buttons */ .dataTables_wrapper .dataTables_paginate .page-item.previous .page-link, .dataTables_wrapper .dataTables_paginate .page-item.next .page-link { @@ -1295,7 +1295,8 @@
|---|