Merge branch 'enad-Q3' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q3

# Conflicts:
#	Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html
MOHEMM-SFH-COLORS
enadhilal 4 years ago
commit 23dc5814ef

@ -1,6 +1,6 @@
<ion-app [dir]="direction">
<ion-split-pane>
<ion-menu side='start' *ngIf="direction ==='ltr'">
<ion-menu [swipeGesture]="false" side='start' *ngIf="direction ==='ltr'">
<ion-content class="sidebar-menu">
<div class="header-div">
<div>
@ -99,7 +99,7 @@
</ion-content>
</ion-menu>
<ion-menu side='end' *ngIf="direction ==='rtl'">
<ion-menu [swipeGesture]="false" side='end' *ngIf="direction ==='rtl'">
<ion-content class="sidebar-menu">
<div class="header-div">
<div>

@ -69,7 +69,7 @@
</ion-input>
</ion-col>
<ion-col size='3'>
<button [disabled]='inputSearch == undefined || 1 > inputSearch.length' (click)='onChangeInput()' style="--background: white; background: transparent; margin-top: 4px; --background-hover: transparent !important;">
<button [disabled]='inputSearch == undefined || inputSearch.length < 1' (click)='onChangeInput()' style="--background: white;background: transparent;--background-hover: transparent !important; margin-top: 4px;">
<ion-label><p style="color: #269db8;">{{"general, search" | translate}}</p></ion-label>
</button>
</ion-col>

Loading…
Cancel
Save