Skip to content

Commit

Permalink
Merge branch 'QAZIMAAZARSHAD:master' into issue-QAZIMAAZARSHAD#30
Browse files Browse the repository at this point in the history
  • Loading branch information
dilroseR authored Jul 29, 2021
2 parents e193b65 + bc7689e commit 80d963e
Show file tree
Hide file tree
Showing 10 changed files with 2,019 additions and 1,636 deletions.
25 changes: 10 additions & 15 deletions Home.html
Original file line number Diff line number Diff line change
Expand Up @@ -1280,22 +1280,17 @@ <h4 class="head1">List of Acceptable Supporting Documents For Verification</h4>
<div id="footer">
<div class="one">
<div class="contact">
<h2>Contact Us</h2>
<h3>
<i class="fas fa-phone-alt phonei"></i>
Toll free: 1947
</h3>
<h3>
<div class="envelope">
<i class="fas fa-envelope envelopei"></i>
[email protected]
<h2>Contact Us</h2>
<a href="tel:1947" class="contactUsButton">
<i class="fas fa-phone-alt phonei"> Toll free: 1947</i>
</a>
<a href="mailto:[email protected]" class="contactUsButton">
<i class="fas fa-envelope envelopei"> [email protected]</i>
</a>
<a href="help.html" target="_blank" class="contactUsButton">
Help Desk
</a>
</div>
</h3>
</div>
<div class="helpdeskDiv">
<a class="helpdesk" href="help.html" target="_blank">Help
Desk</a>
</div>
<div class="follow-us">
<h2>Follow Us</h2>
<div class="icons">
Expand Down
80 changes: 42 additions & 38 deletions Style.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ body {
transition: background 0.2s linear;
}


body.dark {
background: #292c35;
}
Expand Down Expand Up @@ -648,10 +647,7 @@ body {
.descrip {
background-color: rgb(224, 171, 157);
}
.btn-danger{
float:right;
padding:10px;
}

.declaration_city {
margin-bottom: 20px;
}
Expand All @@ -668,7 +664,7 @@ body {
padding: 2px;
float: left;
margin: 5px;
/* background-color: gray; */
background-color: gray;
height: 28px;
}

Expand Down Expand Up @@ -932,29 +928,30 @@ h1 {
}
}

.helpdesk {
color: white;
.contactUsButton {
display: flex;
align-items: center;
justify-content: center;
font-size: 1.0625em;
border: 2px solid white;
font-weight: 500;
height: 35px;
width: 120px;
cursor: pointer;
min-height: 47px;
transition: 0.3s;
padding: 9px 18px;
padding: 2px 4px;
margin-bottom: 20px;
color: white;
text-decoration: none;
text-align: center
}

.helpdeskDiv {
text-align: left;
margin-top: 30px;
}

.helpdesk:hover {
background-color: white;
.contactUsButton:hover {
color: black;
background-color: white;
text-decoration: none;
}


#scrollToTopButton {
position: fixed;
bottom: 40px;
Expand Down Expand Up @@ -1028,7 +1025,7 @@ ul {
/*padding-top: 60px;*/
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr;
grid-gap: 4em;
grid-gap: 1em;
margin: 30px 90px;
color: rgb(252, 248, 248);
z-index: 100000;
Expand All @@ -1042,7 +1039,7 @@ ul {

.phonei,
.envelopei {
font-size: 18px;
font-size: 15px;
}

.contact h3 {
Expand Down Expand Up @@ -1196,14 +1193,6 @@ ul {
align-items: center;
}

.envelope {
display: flex;
}

.envelopei {
padding-right: 6px;
}

.flex {
display: flex;
}
Expand All @@ -1220,9 +1209,23 @@ ul {
}
}

@media (max-width: 1120px) {
.phonei,
.envelopei {
font-size: 12px;
}
}

@media (max-width: 992px) {
.phonei,
.envelopei {
font-size: 14px;
}
}

@media (max-width: 1074px) {
#footer {
grid-template-columns: 1fr 2fr 1fr 1fr;
grid-template-columns: 1fr 1fr 1fr 1fr;
}

.showPwd1 {
Expand Down Expand Up @@ -1269,7 +1272,7 @@ ul {
#footer {
grid-template-columns: 1fr;
padding-top: 30px;
grid-gap: 2rem;
grid-gap: 1rem;
}
#ft {
height: fit-content;
Expand All @@ -1288,7 +1291,7 @@ ul {
#footer {
margin: 30px 50px;
padding-top: 30px;
grid-gap: 2rem;
grid-gap: 1rem;
}

.two select {
Expand Down Expand Up @@ -1478,9 +1481,9 @@ ul {

@media screen and (max-width: 768px) {
.labelnew {
position: absolute;
right: 2rem;
top: 6rem;
position:relative;
left: 9rem;
top: -74rem;
height: 20px;
width: 42px;
}
Expand All @@ -1499,9 +1502,9 @@ ul {
}
@media screen and (max-width: 575px) {
.label {
position: absolute;
right: 1rem;
top: 4.5rem;
position:relative;
left: 10rem;
top: -74rem;
height: 10px;
width: 22px;
}
Expand All @@ -1516,6 +1519,7 @@ ul {
.fa-moon,
.fa-sun {
font-size: 8px;

}

.checkbox:checked + .label .ball {
Expand All @@ -1526,7 +1530,7 @@ ul {
@media screen and (max-width: 500px) {
.fa-moon,
.fa-sun {
font-size: 4px;
font-size: 10px;
}
}
.dark {
Expand Down
28 changes: 10 additions & 18 deletions feedbackform.html
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,6 @@
.three ul li a h4:hover {
color: #037AE2;
}
.helpdesk{
text-decoration: none;
}
</style>

<body>
Expand Down Expand Up @@ -363,22 +360,17 @@
<div id="footer">
<div class="one">
<div class="contact">
<h2>Contact Us</h2>
<h3>
<i class="fas fa-phone-alt phonei"></i>
Toll free: 1947
</h3>
<h3>
<div class="envelope">
<i class="fas fa-envelope envelopei"></i>
[email protected]
<h2>Contact Us</h2>
<a href="tel:1947" class="contactUsButton">
<i class="fas fa-phone-alt phonei"> Toll free: 1947</i>
</a>
<a href="mailto:[email protected]" class="contactUsButton">
<i class="fas fa-envelope envelopei"> [email protected]</i>
</a>
<a href="help.html" target="_blank" class="contactUsButton">
Help Desk
</a>
</div>
</h3>
</div>
<div class="helpdeskDiv">
<a class="helpdesk" href="help.html" target="_blank">Help
Desk</a>
</div>
<div class="follow-us">
<h2>Follow Us</h2>
<div class="icons">
Expand Down
28 changes: 10 additions & 18 deletions feedbackformsubmitted.html
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,6 @@
.three ul li a h4:hover {
color: #037AE2;
}
.helpdesk{
text-decoration: none;
}
</style>

<body>
Expand Down Expand Up @@ -376,22 +373,17 @@ <h4 id="f2">
<div id="footer">
<div class="one">
<div class="contact">
<h2>Contact Us</h2>
<h3>
<i class="fas fa-phone-alt phonei"></i>
Toll free: 1947
</h3>
<h3>
<div class="envelope">
<i class="fas fa-envelope envelopei"></i>
[email protected]
<h2>Contact Us</h2>
<a href="tel:1947" class="contactUsButton">
<i class="fas fa-phone-alt phonei"> Toll free: 1947</i>
</a>
<a href="mailto:[email protected]" class="contactUsButton">
<i class="fas fa-envelope envelopei"> [email protected]</i>
</a>
<a href="help.html" target="_blank" class="contactUsButton">
Help Desk
</a>
</div>
</h3>
</div>
<div class="helpdeskDiv">
<a class="helpdesk" href="help.html" target="_blank">Help
Desk</a>
</div>
<div class="follow-us">
<h2>Follow Us</h2>
<div class="icons">
Expand Down
50 changes: 30 additions & 20 deletions forgetPass.html
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,6 @@
.three ul li a h4:hover {
color: #037AE2;
}
.helpdesk{
text-decoration: none;
}
</style>

<body>
Expand Down Expand Up @@ -250,6 +247,7 @@
var pwd = document.getElementById("Password1").value;
var pwd2 = document.getElementById('Password2').value;
var filter = /^([a-zA-Z0-9_\.\-]+)\@([a-zA-Z0-9]+\.*[a-zA-Z0-9]+)\.([a-zA-Z0-9]{2,4})$/;
var sc = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/;
if(uname =='')
{
giveAlert("please enter email address.","info");
Expand All @@ -262,10 +260,27 @@
{
giveAlert("Enter valid email id.","info");
}
else if(pwd.length < 6 || pwd.length > 6)
else if(pwd.length < 8 ||pwd.length > 16)
{
giveAlert("Password min and max length is 6.","info");
giveAlert("Password min length: 8 & max length: 16","info");
}
else if(pwd.search(/[a-z]/) < 0)
{
giveAlert("Your password needs a lower case letter","info");
}
else if(pwd.search(/[A-Z]/) < 0)
{
giveAlert("Your password needs an upper case letter","info");
}
else if(pwd.search(/[0-9]/) < 0)
{
giveAlert("Your password needs a number","info");
}
else if(!sc.test(pwd))
{
giveAlert("Your password needs a special character","info");

}
else if (!(pwd === pwd2))
{
giveAlert("Passwords do not match.", "info");
Expand All @@ -284,22 +299,17 @@
<div id="footer">
<div class="one">
<div class="contact">
<h2>Contact Us</h2>
<h3>
<i class="fas fa-phone-alt phonei"></i>
Toll free: 1947
</h3>
<h3>
<div class="envelope">
<i class="fas fa-envelope envelopei"></i>
[email protected]
<h2>Contact Us</h2>
<a href="tel:1947" class="contactUsButton">
<i class="fas fa-phone-alt phonei"> Toll free: 1947</i>
</a>
<a href="mailto:[email protected]" class="contactUsButton">
<i class="fas fa-envelope envelopei"> [email protected]</i>
</a>
<a href="help.html" target="_blank" class="contactUsButton">
Help Desk
</a>
</div>
</h3>
</div>
<div class="helpdeskDiv">
<a class="helpdesk" href="help.html" target="_blank">Help
Desk</a>
</div>
<div class="follow-us">
<h2>Follow Us</h2>
<div class="icons">
Expand Down
Loading

0 comments on commit 80d963e

Please sign in to comment.