Fixed landing page being broken in mobile and merged popup styling

This commit is contained in:
Keannu Bernasol 2023-12-03 11:26:16 +08:00
parent fb41277746
commit 1c595b3b03
4 changed files with 16 additions and 29 deletions

View file

@ -140,18 +140,7 @@ export default function EquipmentInstancesListPage() {
onClose={() => SetEditModalOpen(false)} onClose={() => SetEditModalOpen(false)}
modal modal
position={"top center"} position={"top center"}
contentStyle={{ contentStyle={styles.popup_center}
width: "32rem",
borderRadius: 16,
borderColor: "grey",
borderStyle: "solid",
borderWidth: 1,
padding: 16,
alignContent: "center",
justifyContent: "center",
textAlign: "center",
flexWrap: "wrap",
}}
> >
<EditItemModal id={selectedItem} setOpen={SetEditModalOpen} /> <EditItemModal id={selectedItem} setOpen={SetEditModalOpen} />
</Popup> </Popup>

View file

@ -140,18 +140,7 @@ export default function EquipmentListPage() {
onClose={() => SetEditModalOpen(false)} onClose={() => SetEditModalOpen(false)}
modal modal
position={"top center"} position={"top center"}
contentStyle={{ contentStyle={styles.popup_center}
width: "32rem",
borderRadius: 16,
borderColor: "grey",
borderStyle: "solid",
borderWidth: 1,
padding: 16,
alignContent: "center",
justifyContent: "center",
textAlign: "center",
flexWrap: "wrap",
}}
> >
<EditSKUModal id={selectedItem} setOpen={SetEditModalOpen} /> <EditSKUModal id={selectedItem} setOpen={SetEditModalOpen} />
</Popup> </Popup>

View file

@ -39,14 +39,11 @@ export default function LandingPage() {
flexWrap: "wrap", flexWrap: "wrap",
}} }}
> >
<div <div style={{ height: "auto", flex: 1, flexWrap: "wrap" }}>
style={{ maxWidth: "50%", height: "auto", flex: 1, flexWrap: "wrap" }} <img style={{ width: "16rem", height: "auto" }} src={citc_logo} />
>
<img style={{ maxWidth: "50%", height: "auto" }} src={citc_logo} />
</div> </div>
<div <div
style={{ style={{
maxWidth: "50%",
height: "auto", height: "auto",
flex: 1, flex: 1,
flexWrap: "wrap", flexWrap: "wrap",

View file

@ -75,6 +75,18 @@ const styles: { [key: string]: React.CSSProperties } = {
minWidth: "100%", minWidth: "100%",
marginTop: 16, marginTop: 16,
}, },
popup_center: {
width: "32rem",
borderRadius: 16,
borderColor: "grey",
borderStyle: "solid",
borderWidth: 1,
padding: 16,
alignContent: "center",
justifyContent: "center",
textAlign: "center",
overflowY: "scroll",
},
}; };
export default styles; export default styles;