Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactored mui-root styles to theme.jsx #430

Merged
merged 1 commit into from
Dec 26, 2024
+71 −108
Merged

Refactored mui-root styles to theme.jsx #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions frontend/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Bluewave Onboarding</title>
<script type="module" crossorigin src="/assets/index-CSUaIvQz.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-EhLntcaF.css">
<script type="module" crossorigin src="/assets/index-D5CQAkNt.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-CAHgKvIG.css">
</head>

<body>
Expand Down
70 changes: 66 additions & 4 deletions frontend/src/assets/theme.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,24 @@ export const lightTheme = createTheme({
},
},
},
MuiTabPanel: {
styleOverrides: {
root: {
padding: 0,
},
},
},
MuiMenuItem: {
styleOverrides: {
root: {
margin: "0px 5px !important",
"&.Mui-selected": {
backgroundColor: "#F9FAFB !important",
borderRadius: "8px !important",
},
},
},
},
MuiDrawer: {
styleOverrides: {
paper: {
Expand All @@ -38,6 +56,19 @@ export const lightTheme = createTheme({
},
},
},
MuiOutlinedInput: {
styleOverrides: {
root: {
borderRadius: "8px",
"&:hover .MuiOutlinedInput-notchedOutline": {
borderColor: "var(--main-purple)",
},
"&.Mui-focused .MuiOutlinedInput-notchedOutline": {
borderColor: "var(--main-purple)",
},
},
},
},
MuiButtonBase: {
defaultProps: {
disableRipple: true,
Expand Down Expand Up @@ -69,6 +100,33 @@ export const darkTheme = createTheme({
},
},
},
MuiTab: {
styleOverrides: {
root: {
textTransform: "none",
fontSize: "14px",
padding: "3px 9px",
},
},
},
MuiTabPanel: {
styleOverrides: {
root: {
padding: 0,
},
},
},
MuiMenuItem: {
styleOverrides: {
root: {
margin: "0px 5px !important",
"&.Mui-selected": {
backgroundColor: "#F9FAFB !important",
borderRadius: "8px !important",
},
},
},
},
MuiDrawer: {
styleOverrides: {
paper: {
Expand All @@ -78,12 +136,16 @@ export const darkTheme = createTheme({
},
},
},
MuiTab: {
MuiOutlinedInput: {
styleOverrides: {
root: {
textTransform: "none",
fontSize: "14px",
padding: "3px 9px",
borderRadius: "8px",
"&:hover .MuiOutlinedInput-notchedOutline": {
borderColor: "var(--main-purple)",
},
"&.Mui-focused .MuiOutlinedInput-notchedOutline": {
borderColor: "var(--main-purple)",
},
},
},
},
Expand Down
16 changes: 0 additions & 16 deletions frontend/src/components/ColorTextField/ColorTextField.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,6 @@

.colorTextField {

:global {
.MuiOutlinedInput-root {
&:hover fieldset {
border-color: var(--main-purple);
}

&.Mui-focused fieldset {
border-color: var(--main-purple);
}

}
.MuiOutlinedInput-root {
border-radius: 8px;
}
}

input {
font-size: var(--font-regular);
height: 34px;
Expand Down
8 changes: 0 additions & 8 deletions frontend/src/components/DropdownList/DropdownList.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,3 @@
font-size: var(--font-regular) !important;
}

.MuiMenuItem-root.Mui-selected {
background-color: #F9FAFB !important;
border-radius: 8px !important;
}

.MuiMenuItem-root {
margin: 0px 5px !important;
}
25 changes: 0 additions & 25 deletions frontend/src/components/HeadingTabs/HeadingTabs.jsx
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions frontend/src/components/HeadingTabs/TabStyles.css
View file
Open in desktop

This file was deleted.

12 changes: 1 addition & 11 deletions frontend/src/components/TextFieldComponents/CustomTextField/CustomTextFieldStyles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,4 @@
}
border-radius: 8px !important;

}

.textField .MuiButton-root {
font-size: var(--font-regular);
color: var(--second-text-color);
}

.MuiBox-root .MuiInputLabel-root {
font-size: var(--font-regular);
color: var(--second-text-color);
}
}
4 changes: 0 additions & 4 deletions frontend/src/scenes/settings/TeamTab/TeamTab.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ h6 {
font-weight: 600;
}

.MuiTabPanel-root {
padding: 0
}

.pencil {
cursor: pointer;
}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/utils/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// API constants
//local environment
// export const API_BASE_URL = 'http://localhost:3000/api/';
export const API_BASE_URL = 'http://localhost:3000/api/';

//staging environment
export const API_BASE_URL = 'https://onboarding-demo.bluewavelabs.ca/api/';
// export const API_BASE_URL = 'https://onboarding-demo.bluewavelabs.ca/api/';
// Other constants
export const APP_TITLE = 'Bluewave Onboarding';
export const SUPPORT_EMAIL = 'support@bluewave.com';
Expand Down
Loading