Compare commits

...

7 Commits

Author SHA1 Message Date
victorAnumudu fa7660de29 updated site logo 2025-07-02 06:57:16 +01:00
ameye bde30f781a Merge branch 'font-match' of MERMS/MermsPanelReactJS into master 2025-06-30 00:29:55 +00:00
ameye 9f9dcc5e37 Merge branch 'footer-year' of MERMS/MermsPanelReactJS into master 2025-06-30 00:29:47 +00:00
victorAnumudu ec11a7b5b3 started font matching 2025-06-29 14:43:04 +01:00
CHIEFSOFT\ameye 38c5717667 register 2025-06-28 20:46:19 -04:00
CHIEFSOFT\ameye 77eaf15c6a sign up url 2025-06-28 20:38:43 -04:00
CHIEFSOFT\ameye 60488524ed new logo 2025-06-28 00:42:52 -04:00
9 changed files with 18 additions and 14 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 18 KiB

+7 -3
View File
@@ -22,10 +22,9 @@
}
.login-links a {
font-size: 15px;
font-weight: 700;
font-size: 14px;
padding: 0px 20px;
border-right: 2px solid;
border-right: 2px solid #6c757d;
cursor: pointer;
}
@@ -35,4 +34,9 @@
.login-links a:last-child{
border: 0px;
}
button{
font-size: 1rem!important;
font-weight: 700!important;
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

@@ -38,8 +38,8 @@ export default function UserHeader(){
<div className="navbar-header d-flex align-items-center">
<a href="#" onClick={toggleSidebar} className="mobile-toggle"><i className="ti ti-align-right"></i></a>
<a className="navbar-brand" href="/dash">
<img src={getImage('logo-light.png')} className="img-fluid logo-desktop" alt="logo"/>
<img src={getImage('logo-icon.png')} className="img-fluid logo-mobile" alt="logo"/>
<img src={getImage('logo-pink.png')} className="img-fluid logo-desktop" alt="logo"/>
<img src={getImage('logo-pink.png')} className="img-fluid logo-mobile" alt="logo"/>
</a>
</div>
<button onClick={removeSidebar} className="navbar-toggler" type="button" data-bs-toggle="collapse"
+1
View File
@@ -10,6 +10,7 @@ body {
outline:0;
background:$body;
color:$muted;
font-weight: $font-regular;
&.sidebar-mini {
.app-main {
padding-left:$sidebar-mini;
+1 -2
View File
@@ -39,8 +39,7 @@ h6 {
p {
color: $muted;
font-weight: $font-regular;
font-size: $font-base;
font-size: $font-18;
line-height: $line-md;
}
a {
+3 -3
View File
@@ -35,13 +35,13 @@ $container-max-widths: (
// Colors
$body : #f9f9fb;
$primary : #8E54E9;
$primary : #148399; //#8E54E9;
$primary2 : #4776E6;
$secondary : #a1a1a1;
$light-gray : #eceef3;
$dark-gray : #2c2e3e;
$darker-gray : #333333;
$muted : #a6a9b7;
$muted : #6c757d; //#a6a9b7;
$info : #45aaf2;
$danger : #e3324c;
$cyan : #2bcbba;
@@ -75,7 +75,7 @@ $behance : #053eff;
$whatsapp : #4FCE5D;
// Font family
$font-primary : 'Roboto', sans-serif;
$font-primary : 'Plus Jakarta Sans', sans-serif;
//Font size
+3 -3
View File
@@ -114,7 +114,7 @@ export const signUpUser = (reqData) => {
let postData = {
...reqData
}
return postAuxEnd('/panel/auth/register', postData, false)
return postAuxEnd('/panel/Register', postData, false)
}
// FUNCTION TO VERIFY EMAIL
@@ -122,7 +122,7 @@ export const verifyEmail = (reqData) => {
let postData = {
...reqData
}
return postAuxEnd('/panel/auth/register/verify', postData, false)
return postAuxEnd('/panel/Register/verify', postData, false)
}
// FUNCTION TO COMPLETE REGISTRATION
@@ -130,7 +130,7 @@ export const completeRegistration = (reqData) => {
let postData = {
...reqData
}
return postAuxEnd('/panel/auth/register/complete', postData, false)
return postAuxEnd('/panel/Register/complete', postData, false)
}
// FUNCTION TO SUBSCRIBE
+1 -1
View File
@@ -1,6 +1,6 @@
let getImage = (location) => {
if (!location) {
return require(`../assets/img/logo.png`);
return require(`../assets/img/logo-pink.png`);
} else {
return require(`../assets/img/${location}`);
}