Przeglądaj źródła

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

pull/33/head
safet.purkovic 3 lat temu
rodzic
commit
5de1c34b2f

+ 3
- 0
src/assets/styles/components/_icon-button.scss Wyświetl plik

height: 34px !important; height: 34px !important;
min-width: none !important; min-width: none !important;
} }
.td-btn.active{
background-color: red !important;
}
.td-btn:hover{ .td-btn:hover{
background-color: white !important; background-color: white !important;
} }

+ 6
- 6
src/components/Section/MainContainer.js Wyświetl plik

import Navbar from "../../components/MUI/NavbarComponent"; import Navbar from "../../components/MUI/NavbarComponent";
// import AppRoutes from "../../AppRoutes"; // import AppRoutes from "../../AppRoutes";


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

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


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



+ 1
- 1
src/pages/UsersPage/UsersPage.js Wyświetl plik

/> />
</IconButton> </IconButton>
<IconButton <IconButton
className={"c-btn--primary-outlined c-btn td-btn"}
className={`c-btn--primary-outlined c-btn td-btn ${n.isEnabled && 'active'}`}
> >
<img <img
style={{ style={{

Ładowanie…
Anuluj
Zapisz