Skip to content

Commit

Permalink
Merge pull request #523 from aranaravi/develop
Browse files Browse the repository at this point in the history
[MOSIP-28860]Modified the message inside error code as it is duplicate
  • Loading branch information
aranaravi authored Oct 16, 2023
2 parents f1de30a + 1230b60 commit 096241c
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 2 deletions.
32 changes: 31 additions & 1 deletion resident-ui/src/app/feature/verify/verify/verify.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ input{
margin-left: 12px;
}

::ng-deep .mat-tooltip {
/*::ng-deep .mat-tooltip {
background-color: #ffffff !important;
color: black !important;
font-size: 11px !important;
Expand Down Expand Up @@ -218,4 +218,34 @@ input{
transform: rotate(0);
}
}
}*/

::ng-deep .mat-tooltip {
background-color: #fff !important;
color: black !important;
font-size: 11px !important;
border-radius: 8px !important;
padding: 10px !important;
box-shadow: 2px 2px 8px rgba(0, 0, 0, 0.5) !important;
margin-top: -2px !important;
}
::ng-deep .mat-tooltip::after {
width: 0;
height: 0;
content: '';
position: absolute;
border-left: 0.5rem solid transparent;
border-right: 0.5rem solid transparent;
border-bottom: 0.5rem solid #000 8c;
border-color: transparent transparent #fff transparent;
border-width: 10px;
}
::ng-deep .mat-tooltip.below {
overflow: initial;
margin-top: 0.4rem;
}
::ng-deep .mat-tooltip.below:after {
top: 15rem;
right: calc(50% - 0.5rem);
transform: rotate(0);
}
4 changes: 4 additions & 0 deletions resident-ui/src/app/shared/header/header.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,27 +198,31 @@ export class HeaderComponent implements OnInit, OnDestroy {
if(item.fontSize === "12"){
if(this.agent.indexOf('firefox') > -1){
document.body.style["transform"] = "scale(1, .9)";
document.body.style["transformOrigin "] = "0 0";
document.body.style["margin-top"] = "-2.5%";
}else{
document.body.style["zoom"]= "90%";
}
}else if(item.fontSize === "14"){
if(this.agent.indexOf('firefox') > -1){
document.body.style["transform"] = "scale(1, 1.0)";
document.body.style["transformOrigin "] = "0 0";
document.body.style["margin-top"] = "0%";
}else{
document.body.style["zoom"]= "100%";
}
}else if(item.fontSize === "16"){
if(this.agent.indexOf('firefox') > -1){
document.body.style["transform"] = "scale(1, 1.1)";
document.body.style["transformOrigin "] = "0 0";
document.body.style["margin-top"] = "2.1%";
}else{
document.body.style["zoom"]= "110%";
}
}else if(item.fontSize === "18"){
if(this.agent.indexOf('firefox') > -1){
document.body.style["transform"] = "scale(1, 1.2)";
document.body.style["transformOrigin "] = "0 0";
document.body.style["margin-top"] = "4.5%";
}else{
document.body.style["zoom"]= "120%";
Expand Down
3 changes: 2 additions & 1 deletion resident-ui/src/assets/i18n/eng.json
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,8 @@
"identity/preferredLang": "Invalid preferred language. please give valid data."
},
"RES-SER-459": "The entered EID is not associated with the UIN/ VID used to log in.",
"RES-SER-412": "Invalid UIN/ VID entered. Please enter a valid UIN/ VID and try again.",
"RES-SER-412": "Unable to access API resource.",
"RES-SER-522": "Invalid UIN/ VID entered. Please enter a valid UIN/ VID and try again.",
"RES-SER-405": "Maximum allowed VIDs are active. Deactivate VID(s) to create a new one.",
"RES-SER-511": "The entered EID is not associated with the UIN/ VID used to log in.",
"RES-SER-449": "Invalid UIN/ AID/ VID entered. Please enter a valid UIN/ AID/ VID and try again.",
Expand Down

0 comments on commit 096241c

Please sign in to comment.