Merge remote-tracking branch 'upstream/master' into feat/image-upload

This commit is contained in:
Daniel Cojocea committed 2024-07-08 14:06:53 -04:00
commit 7f7226d6e5
42 files changed
+1776 -549

No files matched your search

+8 -7
View File
@@ -1,9 +1,10 @@
const pathMap = {
"/monitors": "Monitors",
"/incidents": "Incidents",
"/status" : "Status Pages",
"/integrations": "Integrations",
"/settings" : "Settings"
}
"/monitors": "Monitors",
"/incidents": "Incidents",
"/status": "Status Pages",
"/integrations": "Integrations",
"/maintenance": "maintenance",
"/settings": "Settings",
};
export default pathMap;
export default pathMap;
+21 -3
View File
@@ -88,14 +88,32 @@ const theme = createTheme({
},
content: {
pX: "80px",
pY: "40px"
pY: "40px",
},
gap: {
small: "8px",
medium: "12px",
ml: "16px",
large: "24px",
xl: "40px"
}
xl: "40px",
},
alert: {
info: {
color: secondaryMain,
bg: otherColorsWhite,
border: "#d0d5dd",
},
error: {
color: "#d92d20",
bg: "hsla(0, 100%, 52%, 0.03)",
border: "#f04438",
},
warning: {
color: "#f79009",
bg: "#fffaef",
border: "#fecf60"
},
},
});
export default theme;