Bläddra i källkod

Merge branch 'feature/1372_updated_main_container' of Neca/HRCenter into FE_dev

pull/33/head
safet.purkovic 3 år sedan
förälder
incheckning
5de1c34b2f

+ 3
- 0
src/assets/styles/components/_icon-button.scss Visa fil

@@ -10,6 +10,9 @@
height: 34px !important;
min-width: none !important;
}
.td-btn.active{
background-color: red !important;
}
.td-btn:hover{
background-color: white !important;
}

+ 6
- 6
src/components/Section/MainContainer.js Visa fil

@@ -4,18 +4,18 @@ import { useLocation } from "react-router-dom";
import Navbar from "../../components/MUI/NavbarComponent";
// import AppRoutes from "../../AppRoutes";

const urls = ["/", "/login", "/forgot-password", "/reset-password",'/forgot-password-confirmation','/error-page'];

const MainContainer = ({ children }) => {
const { pathname } = useLocation();

return pathname !== "/" && pathname !== "/login" ? (
return urls.includes(pathname) ? (
<div className="">{children}</div>
) : (
<div className="">
<Navbar />
<div className="h-withHeader">
{children}
</div>
<div className="h-withHeader">{children}</div>
</div>
) : (
<div className="">{children}</div>
);
};


+ 1
- 1
src/pages/UsersPage/UsersPage.js Visa fil

@@ -109,7 +109,7 @@ const UsersPage = () => {
/>
</IconButton>
<IconButton
className={"c-btn--primary-outlined c-btn td-btn"}
className={`c-btn--primary-outlined c-btn td-btn ${n.isEnabled && 'active'}`}
>
<img
style={{

Laddar…
Avbryt
Spara