Merge branch 'production' of https://github.com/Walkover-Web-Solutt p…

…ush origin 22dec-mac-electronion/Giddh-New-Angular4-App into 22dec-mac-electron
Walkover-Web-Solution · Jan 21, 2021 · 181d739 · 181d739
2 parents d3024b8 + 384cd7d
commit 181d739
Show file tree

Hide file tree

Showing 572 changed files with 10,879 additions and 10,362 deletions.
diff --git a/apps/web-giddh/src/app/accounting/accounting.component.html b/apps/web-giddh/src/app/accounting/accounting.component.html
@@ -6,6 +6,6 @@
 
 <input type="hidden" [attr.data-gridType]="gridType" id="get-grid-type">
 
-<div class="sidebar-menu col-xs-2 col-sm-2 pd0">
+<div class="sidebar-menu col-xs-2 col-sm-2 p-0">
     <accounting-sidebar></accounting-sidebar>
 </div>
diff --git a/...c/app/accounting/accounting.component.css → .../app/accounting/accounting.component.scss b/...c/app/accounting/accounting.component.css → .../app/accounting/accounting.component.scss
@@ -1,8 +1,10 @@
+@import "../../assets/css/color.scss";
+
 :host ::ng-deep .parent-Group {
     padding-left: 0;
 }
 
-:host ::ng-deep .acntAccordion .mainLiAclist .title:before {
+:host ::ng-deep .account-accordion .main-account-list .title:before {
     content: none;
 }
 
@@ -24,21 +26,21 @@
     border: none;
 }
 
-.bg_wrap {
-    background: #f5f5f5;
+.bg-wrap {
+    background: $gray-95;
 }
 
-.entry_table thead th {
+.entry-table thead th {
     font-weight: normal;
     padding: 8px 6px;
 }
 
-.entry_table tbody tr td {
+.entry-table tbody tr td {
     padding: 0;
     border: 0;
 }
 
-.entry_table tbody tr td .form-control {
+.entry-table tbody tr td .form-control {
     background: transparent !important;
     border: 0;
     border-radius: 0 !important;
@@ -47,16 +49,16 @@
     padding: 0 6px !important;
 }
 
-.entry_table tbody tr td .form-control.focus:focus {
-    background: #ccc !important;
+.entry-table tbody tr td .form-control.focus:focus {
+    background: $very-light-gray !important;
 }
 
-.activeRow {
-    background: #e5e5e5;
+.active-row {
+    background: $whisper;
 }
 
-.confirmation_box {
-    background: white;
+.confirmation-box {
+    background: $white;
     display: inline-block;
     padding: 20px;
     width: 230px;
@@ -67,7 +69,7 @@
     margin: 20px 0;
 }
 
-.total_box {
+.total-box {
     padding: 15px 0;
     border-top: 1px solid;
     border-bottom: 1px solid;
@@ -76,57 +78,57 @@
     font-size: 14px;
 }
 
-.total_box > span {
+.total-box > span {
     margin: 0 8px;
     display: inline-block;
     min-width: 120px;
 }
 
 .appearance-none {
-    background: #e5e5e5 !important;
+    background: $whisper !important;
     border: 0 !important;
     font-size: 16px;
-    color: #333333;
+    color: $night-rider;
 }
 
-.account_listbar {
+.account-listbar {
     overflow-y: hidden;
     height: 100vh;
     width: 250px;
-    background: white;
+    background: $white;
     position: absolute;
     left: -250px;
     z-index: 0;
 }
 
 .sidebar-menu {
     min-height: 100vh;
-    background: #262626;
-    color: white;
+    background: $nero;
+    color: $white;
     float: right;
     /* width: 250px; */
     position: relative;
 }
 
-.menu_list {
+.menu-list {
     padding: 15px 0;
 }
 
-.menu_list li {
+.menu-list li {
     list-style: none;
 }
 
-.menu_list li a {
-    color: #fff;
+.menu-list li a {
+    color: $white;
     padding: 4px 12px;
     display: block;
 }
 
-.menu_list li a.isHidden {
-    color: #4d4d4d;
+.menu-list li a.isHidden {
+    color: $matterhorn;
 }
 
-.sidebar_list {
+.sidebar-list {
     width: 300px;
     position: absolute;
     right: 0;
@@ -135,11 +137,11 @@
     padding: 0 !important;
     border: 0;
     z-index: 0;
-    border-left: 1px solid #d6d6d6;
+    border-left: 1px solid $gainsboro;
 }
 
-.sidebar_list h3 {
-    background: #fff;
+.sidebar-list h3 {
+    background: $white;
 }
 /*
 .label.isActive {
@@ -153,7 +155,7 @@ input[name="entryDate"] {
     background: transparent !important;
     border: 0;
     padding: 0 !important;
-    color: #333;
+    color: $night-rider;
     height: auto;
     width: 100px;
     font-size: 16px;
@@ -166,7 +168,7 @@ textarea[name="narration"] {
 
 input[name="entryDate"]:focus,
 textarea[name="narration"]:focus {
-    background: #e5e5e5 !important;
+    background: $whisper !important;
 }
 
 :host ::ng-deep .menu {
@@ -180,3 +182,7 @@ textarea[name="narration"]:focus {
 :host ::ng-deep .menu {
     border-left: 0 !important;
 }
+
+.modal-voucher{
+    width: 298px !important;
+}
diff --git a/apps/web-giddh/src/app/accounting/accounting.component.ts b/apps/web-giddh/src/app/accounting/accounting.component.ts
@@ -82,7 +82,7 @@ export const PAGES_WITH_CHILD = ['Purchase', 'Sales', 'Credit note', 'Debit note
 
 @Component({
     templateUrl: './accounting.component.html',
-    styleUrls: ['./accounting.component.css']
+    styleUrls: ['./accounting.component.scss']
 })
 
 export class AccountingComponent implements OnInit, OnDestroy {

diff --git a/apps/web-giddh/src/app/accounting/accouting-sidebar/accounting-sidebar.component.html b/apps/web-giddh/src/app/accounting/accouting-sidebar/accounting-sidebar.component.html
@@ -1,4 +1,4 @@
-<ul class="menu_list">
+<ul class="menu-list">
     <li><a class="cp" (click)="setSelectedPage('Contra', 'voucher', 'purchases')"
             [ngClass]="{ 'active-parent': selectedVoucher === 'Contra'}">F4: Contra</a></li>
 

diff --git a/apps/web-giddh/src/app/accounting/accouting-sidebar/accounting-sidebar.component.scss b/apps/web-giddh/src/app/accounting/accouting-sidebar/accounting-sidebar.component.scss
@@ -1,6 +1,6 @@
 @import '../../../assets/css/color.scss';
 
-.account_listbar {
+.account-listbar {
     overflow-y: hidden;
     height: 100vh;
     width: 250px;
@@ -25,26 +25,26 @@
     position: relative;
 }
 
-.menu_list {
+.menu-list {
     padding: 0;
 }
 
-.menu_list li {
+.menu-list li {
     list-style: none;
 }
 
-.menu_list li a {
+.menu-list li a {
     color: $white;
     padding: 7px 12px;
     display: block;
     font-size: 14px;
 }
 
-.menu_list li a:hover {
+.menu-list li a:hover {
     background: $night-rider;
 }
 
-.menu_list li a.isHidden {
+.menu-list li a.isHidden {
     color: $matterhorn;
 }