Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"moment-duration-format": "^2.3.2",
"moment-timezone": "^0.5.33",
"mui-color-input": "^9.0.0",
"openstack-uicore-foundation": "5.0.67",
"openstack-uicore-foundation": "5.0.70",
"p-limit": "^6.1.0",
"path-browserify": "^1.0.1",
"postcss-loader": "^6.2.1",
Expand Down
25 changes: 2 additions & 23 deletions src/components/CustomTheme.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,40 +25,23 @@ const theme = createTheme(MuiBaseCustomTheme, {
typography: {
fontFamily: ["Roboto", "sans-serif"].join(","),
body1: {
fontSize: "14px",
fontWeight: 400
fontSize: "14px"
},
body2: {
fontSize: "14px",
fontWeight: 500
},
caption: {
fontSize: "12px",
fontWeight: 400
},
subtitle2: ({ theme: t }) => ({
fontSize: "14px",
fontWeight: 500,
color: t.palette.text.primary
}),
h4: {
fontSize: "34px",
fontWeight: 500,
lineHeight: "42px",
letterSpacing: "0.25px"
fontWeight: 500
},
h5: {
fontSize: "24px",
fontWeight: 400,
"&.MuiTypography-gutterBottom": {
marginBottom: "20px"
}
},
h6: {
fontSize: "20px",
fontWeight: 500,
lineHeight: "32px",
letterSpacing: "0.15px",
"&.MuiTypography-gutterBottom": {
marginBottom: "20px"
}
Expand All @@ -78,18 +61,15 @@ const theme = createTheme(MuiBaseCustomTheme, {
MuiButton: {
styleOverrides: {
root: ({ ownerState }) => ({
fontWeight: 500,
boxShadow: "none",
"&:hover": { boxShadow: "none" },
"&:active": { boxShadow: "none" },
"&:focus": { boxShadow: "none" },
...(ownerState.size === "small" && {
fontSize: "13px",
lineHeight: "18px",
padding: "9px 16px"
}),
...(ownerState.size === "medium" && {
fontSize: "14px",
lineHeight: "20px",
padding: "8px 12px",
height: "36px"
Expand All @@ -105,7 +85,6 @@ const theme = createTheme(MuiBaseCustomTheme, {
MuiTab: {
styleOverrides: {
root: {
fontSize: "14px",
lineHeight: "18px",
color: "#00000099",
"&.Mui-selected": {
Expand Down
4 changes: 2 additions & 2 deletions src/components/forms/admin-access-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const AdminAccessForm = ({
multi
/>
{formik.touched.members && formik.errors.members && (
<Typography color="error" sx={{ fontSize: "1.2rem", mt: 0.5 }}>
<Typography color="error" sx={{ fontSize: "0.75rem", mt: 0.5 }}>
{formik.errors.members}
</Typography>
)}
Expand All @@ -129,7 +129,7 @@ const AdminAccessForm = ({
multi
/>
{formik.touched.summits && formik.errors.summits && (
<Typography color="error" sx={{ fontSize: "1.2rem", mt: 0.5 }}>
<Typography color="error" sx={{ fontSize: "0.75rem", mt: 0.5 }}>
{formik.errors.summits}
</Typography>
)}
Expand Down
2 changes: 0 additions & 2 deletions src/components/forms/selection-plan-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ const buildInitialValues = (entity, timezone) => {
};

const TAB_SX = {
fontSize: "1.4rem",
lineHeight: "1.8rem",
minHeight: "36px",
px: 2,
py: 1
Expand Down
5 changes: 3 additions & 2 deletions src/components/image-preview-cell.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@ export const ImagePreviewCell = React.memo(
return (
<>
<IconButton
size="medium"
size="small"
aria-label={T.translate("preview_modal.title")}
onClick={() => setOpen(true)}
sx={{ p: 0 }}
>
<ImageIcon fontSize="large" />
<ImageIcon />
</IconButton>

{open && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,13 @@ const MuiFormikDatetimepicker = ({
},
day: {
sx: {
fontSize: "1.2rem",
fontWeight: 600
}
},
layout: {
sx: {
"& .MuiDayCalendar-weekDayLabel": {
fontSize: "1rem"
fontSize: "0.625rem"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/select-page-template-dialog/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ const SelectPageTemplateDialog = ({
{T.translate("show_pages.global_page_popup.title")}
</Typography>
<IconButton size="large" sx={{ p: 0 }} onClick={() => handleClose()}>
<CloseIcon fontSize="large" />
<CloseIcon />
</IconButton>
</DialogTitle>
<Divider />
Expand Down
6 changes: 1 addition & 5 deletions src/components/sponsors/reports/ReportViewToggle.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,12 @@ import T from "i18n-react/dist/i18n-react";
const ReportViewToggle = ({ value, onChange }) => (
<ToggleButtonGroup
exclusive
size="medium"
size="small"
value={value}
onChange={(_e, next) => {
if (next) onChange(next);
}}
aria-label={T.translate("sponsor_reports_page.view_toggle")}
// Match the adjacent action buttons (Print / Export CSV) typography.
// Use px, not rem: this app sets html root font-size to 62.5% (10px), so a
// hardcoded "0.875rem" would render 8.75px. The MuiButton resolves to 14px.
sx={{ "& .MuiToggleButton-root": { fontSize: "14px", fontWeight: 500 } }}
>
<ToggleButton value="orders">
{T.translate("sponsor_reports_page.view_orders")}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ const AddFormTemplateItemDialog = ({
return (
<Dialog open onClose={handleClose} maxWidth="md" fullWidth>
<DialogTitle sx={{ display: "flex", justifyContent: "space-between" }}>
<Typography fontSize="1.5rem">
<Typography fontSize="1rem">
{T.translate("inventory_items_list_modal.select_items")}
</Typography>
<IconButton size="small" onClick={() => handleClose()} sx={{ mr: 1 }}>
Expand Down Expand Up @@ -214,8 +214,7 @@ const AddFormTemplateItemDialog = ({
}
]}
>
<SwapVertIcon fontSize="large" sx={{ mr: 1 }} />{" "}
{T.translate("general.sort_by")}
<SwapVertIcon sx={{ mr: 1 }} /> {T.translate("general.sort_by")}
</MenuButton>
</Grid2>
<Grid2 size={8}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const FormTemplateFromDuplicateDialog = ({
return (
<Dialog open onClose={handleClose} maxWidth="md" fullWidth>
<DialogTitle sx={{ display: "flex", justifyContent: "space-between" }}>
<Typography fontSize="1.5rem">
<Typography fontSize="1rem">
{T.translate("form_template_from_duplicate_dialog.duplicate_form")}
</Typography>
<IconButton size="small" onClick={() => handleClose()} sx={{ mr: 1 }}>
Expand Down Expand Up @@ -125,8 +125,7 @@ const FormTemplateFromDuplicateDialog = ({
}
]}
>
<SwapVertIcon fontSize="large" sx={{ mr: 1 }} />{" "}
{T.translate("general.sort_by")}
<SwapVertIcon sx={{ mr: 1 }} /> {T.translate("general.sort_by")}
</MenuButton>
</Grid2>
<Grid2 size={8}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,6 @@ const FormTemplateListPage = ({
size="small"
onClick={() => handleManageItems(row)}
sx={{
fontSize: "1.3rem",
fontWeight: 500,
lineHeight: "2.2rem",
padding: "4px 5px"
}}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ const PageTemplatePopup = ({
disableEscapeKeyDown={isSaving}
>
<DialogTitle sx={{ display: "flex", justifyContent: "space-between" }}>
<Typography fontSize="1.5rem">{popupTitle}</Typography>
<Typography fontSize="1rem">{popupTitle}</Typography>
<IconButton
size="small"
onClick={handleClose}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const ModuleCloneControl = ({
<Tooltip
title={disabled ? disabledReason : ""}
arrow
componentsProps={{ tooltip: { sx: { fontSize: "1rem" } } }}
componentsProps={{ tooltip: { sx: { fontSize: "0.625rem" } } }}
>
<span>
<Button
Expand Down
6 changes: 1 addition & 5 deletions src/pages/sponsors/components/card-enabled-indicator.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ const CardEnabledIndicator = ({ purchase }) => {

return (
<Tooltip title={label}>
<CreditCardIcon
fontSize="large"
sx={{ color: "primary.main" }}
aria-label={label}
/>
<CreditCardIcon sx={{ color: "primary.main" }} aria-label={label} />
</Tooltip>
);
};
Expand Down
5 changes: 1 addition & 4 deletions src/pages/sponsors/popup/add-sponsor-popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
IconButton,
Divider,
Grid2,
Typography,
InputLabel,
Box
} from "@mui/material";
Expand Down Expand Up @@ -88,9 +87,7 @@ const AddSponsorDialog = ({ onClose, onSubmit, summitId }) => {
disableEscapeKeyDown={isSaving}
>
<DialogTitle sx={{ display: "flex", justifyContent: "space-between" }}>
<Typography fontSize="1.5rem">
{T.translate("sponsor_list.add_sponsor")}
</Typography>
{T.translate("sponsor_list.add_sponsor")}
<IconButton
size="small"
onClick={() => handleClose()}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/sponsors/popup/edit-tier-popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ const EditTierDialog = ({
disableEscapeKeyDown={isSaving}
>
<DialogTitle sx={{ display: "flex", justifyContent: "space-between" }}>
<Typography fontSize="1.5rem">
<Typography fontSize="1rem">
{`${initialEntity.id ? "Edit" : "Add"} ${T.translate(
"edit_summit_sponsorship.tier"
)}`}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/sponsors/show-purchase-list-page/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ const ShowPurchaseListPage = ({
aria-label={T.translate("general.download_invoice")}
disabled={downloadingOrderId !== null}
>
<DownloadIcon fontSize="large" />
<DownloadIcon />
</IconButton>
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ const SponsorFormAddItemFromInventoryPopup = ({
disabled={isSaving}
data-testid="close-dialog"
>
<CloseIcon fontSize="large" />
<CloseIcon />
</IconButton>
</DialogTitle>
<Divider />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const FormTemplatePopup = ({
onClick={handleClose}
disabled={isSaving}
>
<CloseIcon fontSize="large" />
<CloseIcon />
</IconButton>
</DialogTitle>
<Divider />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const SelectSponsorshipsDialog = ({
{T.translate("sponsor_forms.sponsorships_popup.title")}
</Typography>
<IconButton size="large" sx={{ p: 0 }} onClick={() => handleClose()}>
<CloseIcon fontSize="large" />
<CloseIcon />
</IconButton>
</DialogTitle>
<Divider />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const SelectTemplatesDialog = ({
{T.translate("sponsor_forms.global_template_popup.title")}
</Typography>
<IconButton size="large" sx={{ p: 0 }} onClick={() => handleClose()}>
<CloseIcon fontSize="large" />
<CloseIcon />
</IconButton>
</DialogTitle>
<Divider />
Expand Down
6 changes: 2 additions & 4 deletions src/pages/sponsors/sponsor-list-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,7 @@ const SponsorListPage = ({
render: (row) =>
row.sponsorships.map((s) => (
<Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
<Typography
sx={{ fontSize: "1.4rem", mr: "15px", lineHeight: "2rem" }}
>
<Typography sx={{ mr: "15px", lineHeight: "1.25rem" }}>
{s.type?.type?.name}
</Typography>
<Tooltip
Expand Down Expand Up @@ -148,7 +146,7 @@ const SponsorListPage = ({
minWidth: 20,
height: 20,
fontWeight: "500",
fontSize: "1.2rem",
fontSize: "0.75rem",
borderRadius: "100px",
ml: "10px"
}
Expand Down
2 changes: 0 additions & 2 deletions src/pages/sponsors/sponsor-page/components/tab-nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ const TabNav = ({ currentSummit, sponsor, member, history, location }) => {
value={tab.value}
onClick={() => handleTabClick(tab)}
sx={{
fontSize: "1.4rem",
lineHeight: "1.8rem",
height: "36px",
minHeight: "36px",
px: 2,
Expand Down
4 changes: 1 addition & 3 deletions src/pages/sponsors/sponsor-page/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ const SponsorPage = ({
return (
<Box>
<Container maxWidth="lg" sx={{ position: "relative" }}>
<Typography fontSize="3.4rem" variant="h4">
{entity.company?.name}
</Typography>
<Typography variant="h4">{entity.company?.name}</Typography>
<Box sx={{ borderBottom: 1, borderColor: "divider", mt: 2 }}>
<TabNav history={history} location={location} />
</Box>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const EditBadgeScanPopup = ({ badgeScan, onClose, onSubmit }) => {
return (
<Dialog open onClose={handleClose} maxWidth="md" fullWidth>
<DialogTitle sx={{ display: "flex", justifyContent: "space-between" }}>
<Typography fontSize="1.5rem">
<Typography fontSize="1rem">
{T.translate("edit_badge_scan.edit_badge_scan")}
</Typography>
<IconButton size="small" onClick={() => handleClose()} sx={{ mr: 1 }}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,7 @@ const SponsorBadgeScans = ({
startIcon={<AddIcon />}
sx={{
padding: "6px 16px",
fontSize: "1.4rem",
lineHeight: "2.4rem",
letterSpacing: "0.4px"
lineHeight: "1.5rem"
}}
>
{T.translate("sponsor_badge_scans.add_manual_scan")}
Expand All @@ -195,9 +193,7 @@ const SponsorBadgeScans = ({
startIcon={<DownloadIcon />}
sx={{
padding: "6px 16px",
fontSize: "1.4rem",
lineHeight: "2.4rem",
letterSpacing: "0.4px"
lineHeight: "1.5rem"
}}
>
{T.translate("sponsor_badge_scans.export")}
Expand Down
Loading
Loading