Merge branch 'CI4-Application' of bitbucket.org:venbainformationtechnology/ria into CI4-Application

This commit is contained in:
VE10-Sanjeev 2024-08-05 06:03:29 +00:00
commit 2a33ad7b1b
22 changed files with 987 additions and 948 deletions

View File

@ -183,7 +183,7 @@
<!-- Table to show the line item of po -->
<div id="content" > </div>
<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
<thead style="background-color:#c4e1c5;">
<thead style="background-color:#ffffff;">
<tr>
<th>SNo</th>
<th>BillNO</th>

View File

@ -235,7 +235,7 @@ table.dataTable thead > tr > td.sorting {
<!-- Table to show the line item of po -->
<div id="content" > </div>
<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
<!-- <thead style="background-color:#c4e1c5;"> -->
<!-- <thead style="background-color:#ffffff;"> -->
<thead>
<tr>
<th>SNo</th>

View File

@ -251,7 +251,7 @@ table.dataTable thead > tr > td.sorting {
<!-- Table to show the line item of po -->
<div id="content" > </div>
<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
<!-- <thead style="background-color:#c4e1c5;"> -->
<!-- <thead style="background-color:#ffffff;"> -->
<thead>
<tr>
<th>SNo</th>

File diff suppressed because it is too large Load Diff

View File

@ -144,7 +144,7 @@ $currentday = date('d');
}
.celda_normal {
/*background-color: #fff;*/
/* <!-- ad9271 into c4e1c5 brown-light to green-light --> */
/* <!-- ad9271 into ffffff brown-light to green-light --> */
border: 1px solid #ccc;
padding: 2px 4px;
}

View File

@ -68,7 +68,7 @@ if(!empty($amountpaid))
<!-- Table to show the line item of po -->
<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
<!-- <thead style="background-color:#c4e1c5;"> -->
<!-- <thead style="background-color:#ffffff;"> -->
<thead>
<tr>
<th>SNo</th>

View File

@ -42,7 +42,7 @@ foreach($financialyear as $item)
<!-- Table to show the line item of po -->
<div id="content" > </div>
<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
<!-- <thead style="background-color:#c4e1c5;"> -->
<!-- <thead style="background-color:#ffffff;"> -->
<thead>
<tr>
<th>SNo</th>

View File

@ -73,7 +73,7 @@ p {
<!-- Table to show the line item of po -->
<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
<thead style="background-color:#c4e1c5;">style="background-color:#c4e1c5;">
<thead style="background-color:#ffffff;">style="background-color:#ffffff;">
<tr>
<th>SNo</th>
<th>BillNO</th>

View File

@ -212,7 +212,7 @@ foreach($financialyear as $item)
<br>
<input type="hidden" name="Rowid" id="Rowid" placeholder="Row Id" readonly>
<table class="table table-bordered table-hover" id="req" style="table-layout:auto;">
<thead style="background-color:#c4e1c5;">
<thead style="background-color:#ffffff;">
<tr>
<th style="width:50%;">Supplier Name</th>

View File

@ -80,7 +80,7 @@ if(!empty($mapping))
<!-- Table to show the line item of po -->
<div id="content" > </div>
<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
<thead style="background-color:#c4e1c5;">
<thead style="background-color:#ffffff;">
<tr>
<th>SNo</th>
<th>BillNO</th>

View File

@ -1,7 +1,7 @@
<html>
<!-- 5d0411 into 70b673 brown to green -->
<!-- c8b7a7 into c4e1c5 brown-light to green-light -->
<!-- ad9271 into c4e1c5 brown-light to green-light -->
<!-- c8b7a7 into ffffff brown-light to green-light -->
<!-- ad9271 into ffffff brown-light to green-light -->
<!-- 3c8dbc into 00a65a blue to green a tag default color -->
<!-- 3c8dbc into ff0000 blue to red a tag hover color -->
<!-- 8c1919 into 70b673 brown to green -->
@ -212,7 +212,9 @@
<!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"><b>RI</b></span>
<!-- logo for regular state and mobile devices -->
<span class="logo-lg"><b>RESICO</b></span>
<!-- <span class="logo-lg"><b>RESICO</b></span> -->
<img src="<?php echo base_url(); ?>public/assets/dist/img/RESICO (1).png" style="width: 140px;margin-top: 11px;">
</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top">

View File

@ -54,7 +54,7 @@ if(empty($Status))
<table id="Requisition" class="table table-hover" style="background-color:#fff;font-size:12px;">
<thead >
<thead style="background-color: #ddd;">
<tr>
<th>Purchase Order Number</th>
@ -432,7 +432,7 @@ $(function () {
searching: true,
ordering: true,
aaSorting: [[ 6, "desc" ]],
// "columnDefs" : [{"targets":6, "type":"date-eu"}],
info: true,
autoWidth: true,
pageLength: 10,

File diff suppressed because one or more lines are too long

View File

@ -253,7 +253,7 @@ a:focus {
}
.main-header .sidebar-toggle:focus,
.main-header .sidebar-toggle:active {
background: #c4e1c5;
background: #ffffff;
}
.main-header .sidebar-toggle .icon-bar {
display: none;

File diff suppressed because one or more lines are too long

View File

@ -28,7 +28,7 @@
color: #fff;
}
.skin-blue .main-header .navbar .sidebar-toggle:hover {
background-color: #c4e1c5;
background-color: #ffffff;
}
@media (max-width: 767px) {
.skin-blue .main-header .navbar .dropdown-menu li.divider {
@ -38,11 +38,11 @@
color: #fff;
}
.skin-blue .main-header .navbar .dropdown-menu li a:hover {
background: #c4e1c5;
background: #ffffff;
}
}
.skin-blue .main-header .logo {
background-color: #c4e1c5;
background-color: #ffffff;
color: #ffffff;
border-bottom: 0px solid transparent;
}
@ -169,7 +169,7 @@
color: #fff;
}
.skin-blue-light .main-header .navbar .sidebar-toggle:hover {
background-color: #c4e1c5;
background-color: #ffffff;
}
@media (max-width: 767px) {
.skin-blue-light .main-header .navbar .dropdown-menu li.divider {
@ -179,7 +179,7 @@
color: #fff;
}
.skin-blue-light .main-header .navbar .dropdown-menu li a:hover {
background: #c4e1c5;
background: #ffffff;
}
}
.skin-blue-light .main-header .logo {

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
.skin-green .main-header .navbar{background-color:#00a65a}.skin-green .main-header .navbar .nav>li>a{color:#fff}.skin-green .main-header .navbar .nav>li>a:hover,.skin-green .main-header .navbar .nav>li>a:active,.skin-green .main-header .navbar .nav>li>a:focus,.skin-green .main-header .navbar .nav .open>a,.skin-green .main-header .navbar .nav .open>a:hover,.skin-green .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-green .main-header .navbar .dropdown-menu li a{color:#fff}.skin-green .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green .main-header .logo{background-color:#008d4c;color:#fff;border-bottom:0 solid transparent}.skin-green .main-header .logo:hover{background-color:#008749}.skin-green .main-header li.user-header{background-color:#00a65a}.skin-green .content-header{background:transparent}.skin-green .wrapper,.skin-green .main-sidebar,.skin-green .left-side{background-color:#222d32}.skin-green .user-panel>.info,.skin-green .user-panel>.info>a{color:#fff}.skin-green .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-green .sidebar-menu>li>a{border-left:3px solid transparent}.skin-green .sidebar-menu>li:hover>a,.skin-green .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#00a65a}.skin-green .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-green .sidebar a{color:#b8c7ce}.skin-green .sidebar a:hover{text-decoration:none}.skin-green .treeview-menu>li>a{color:#8aa4af}.skin-green .treeview-menu>li.active>a,.skin-green .treeview-menu>li>a:hover{color:#fff}.skin-green .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-green .sidebar-form input[type="text"],.skin-green .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;-o-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-green .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-green .sidebar-form input[type="text"]:focus,.skin-green .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}
.skin-green .main-header .navbar{background-color:#00a65a}.skin-green .main-header .navbar .nav>li>a{color:#fff}.skin-green .main-header .navbar .nav>li>a:hover,.skin-green .main-header .navbar .nav>li>a:active,.skin-green .main-header .navbar .nav>li>a:focus,.skin-green .main-header .navbar .nav .open>a,.skin-green .main-header .navbar .nav .open>a:hover,.skin-green .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-green .main-header .navbar .dropdown-menu li a{color:#fff}.skin-green .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green .main-header .logo{background-color:#00a65a;color:#fff;border-bottom:0 solid transparent}.skin-green .main-header .logo:hover{background-color:#008749}.skin-green .main-header li.user-header{background-color:#00a65a}.skin-green .content-header{background:transparent}.skin-green .wrapper,.skin-green .main-sidebar,.skin-green .left-side{background-color:#222d32}.skin-green .user-panel>.info,.skin-green .user-panel>.info>a{color:#fff}.skin-green .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-green .sidebar-menu>li>a{border-left:3px solid transparent}.skin-green .sidebar-menu>li:hover>a,.skin-green .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#00a65a}.skin-green .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-green .sidebar a{color:#b8c7ce}.skin-green .sidebar a:hover{text-decoration:none}.skin-green .treeview-menu>li>a{color:#8aa4af}.skin-green .treeview-menu>li.active>a,.skin-green .treeview-menu>li>a:hover{color:#fff}.skin-green .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-green .sidebar-form input[type="text"],.skin-green .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;-o-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-green .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-green .sidebar-form input[type="text"]:focus,.skin-green .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}

BIN
public/assets/dist/img/RESICO (1).png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 52 KiB

BIN
public/assets/dist/img/avatar6.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View File

@ -235,7 +235,7 @@
<div class="ibox-content">
<table class="table table-striped table-bordered table-hover dataTables-example" >
<thead style="background: #c4e1c5;">
<thead style="background: #ffffff;">
<tr>
<th>Rendering engine</th>
<th>Browser</th>
@ -696,7 +696,7 @@
<a onclick="fnClickAddRow();" href="javascript:void(0);" class="btn btn-primary ">Add a new row</a>
</div>
<table class="table table-striped table-bordered table-hover " id="editable" >
<thead style="background: #c4e1c5;">
<thead style="background: #ffffff;">
<tr>
<th>Rendering engine</th>
<th>Browser</th>