Skip to content

Commit

Permalink
Corrected layout for MUI6
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanBluefox committed Sep 6, 2024
1 parent 63b1ab9 commit 59163e3
Show file tree
Hide file tree
Showing 34 changed files with 54 additions and 53 deletions.
6 changes: 3 additions & 3 deletions admin/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "./static/css/main.f9bd0fe2.css",
"main.js": "./static/js/main.70c5e245.js",
"main.js": "./static/js/main.fc351027.js",
"static/media/Ground Floor.svg": "./static/media/Ground Floor.c7f7c3851216205112ea.svg",
"static/media/Second Floor.svg": "./static/media/Second Floor.6d7739a57ae0abc218e6.svg",
"static/media/Cellar.svg": "./static/media/Cellar.e8b18e40a39f6a7f3ebf.svg",
Expand Down Expand Up @@ -122,10 +122,10 @@
"static/media/Outdoor Blinds.svg": "./static/media/Outdoor Blinds.40c720abcae8caa5df25.svg",
"static/media/Upstairs.svg": "./static/media/Upstairs.173a9bce7c2bf3e9ecda.svg",
"main.f9bd0fe2.css.map": "./static/css/main.f9bd0fe2.css.map",
"main.70c5e245.js.map": "./static/js/main.70c5e245.js.map"
"main.fc351027.js.map": "./static/js/main.fc351027.js.map"
},
"entrypoints": [
"static/css/main.f9bd0fe2.css",
"static/js/main.70c5e245.js"
"static/js/main.fc351027.js"
]
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/tab_m.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en" xmlns="http://www.w3.org/1999/html"><head><title>Full calendar</title><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="_socket/info.js"></script><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><script defer="defer" src="./static/js/main.70c5e245.js"></script><link href="./static/css/main.f9bd0fe2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body><script>var themeType=window.localStorage.getItem("App.themeType");themeType=themeType||(window.matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light"),window.document.body.className+="dark"===themeType?"body-dark":"body-light"</script></html>
<!doctype html><html lang="en" xmlns="http://www.w3.org/1999/html"><head><title>Full calendar</title><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="_socket/info.js"></script><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><script defer="defer" src="./static/js/main.fc351027.js"></script><link href="./static/css/main.f9bd0fe2.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body><script>var themeType=window.localStorage.getItem("App.themeType");themeType=themeType||(window.matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light"),window.document.body.className+="dark"===themeType?"body-dark":"body-light"</script></html>
2 changes: 1 addition & 1 deletion src-widgets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@
"not ie <= 11",
"not op_mini all"
]
}
}
12 changes: 6 additions & 6 deletions src/src/Component/EventDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,12 @@ const styles = {
marginLeft: 16,
width: 133,
},
timeSelector: {
marginLeft: 16,
marginTop: 8,
timeSelector: theme => ({
marginLeft: '16px',
marginTop: '7.5px',
width: 120,
},
borderBottomColor: theme.palette.mode === 'dark' ? '#FFFFFFB2' : '#000000B2',
}),
days: theme => ({
backgroundColor: theme.palette.mode === 'dark' ? '#656565' : '#dadada',
}),
Expand Down Expand Up @@ -464,10 +465,10 @@ const EventDialog = props => {
'& label': {
transform: 'translate(0px, -9px) scale(0.75)',
},
'&.MuiFormControl-root': styles.timeSelector,
})}
label={props.t('Time')}
variant="standard"
style={styles.timeSelector}
value={date ? dayjs(date) : null}
disabled={props.readOnly || !event?.common.enabled}
onChange={_date => {
Expand Down Expand Up @@ -495,7 +496,6 @@ const EventDialog = props => {
variant="standard"
style={{
...styles.narrowText,
...styles.timeSelector,
}}
helperText={date.getSeconds() ? date.toLocaleTimeString() : ''}
/>}
Expand Down
20 changes: 12 additions & 8 deletions src/src/Component/PlaySimulationDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ const { AdapterMoment } = require('@mui/x-date-pickers/AdapterMoment');

const styles = {
field: {
'& .MuiFormControl-root': { width: '100%' }, display: 'flex', alignItems: 'end', gap: 20,
'& .MuiFormControl-root': { width: '100%' },
display: 'flex',
alignItems: 'end',
gap: '20px',
},
tableCell: {
textAlign: 'center',
Expand All @@ -44,7 +47,11 @@ const PlaySimulationDialog = props => {
<DialogTitle>{I18n.t('Play simulation')}</DialogTitle>
<DialogContent>
<LocalizationProvider dateAdapter={AdapterMoment}>
<Box component="div" sx={styles.field} style={{ width: '100%', marginBottom: 20, marginTop: 10 }}>
<Box
component="div"
sx={styles.field}
style={{ width: '100%', marginBottom: 20, marginTop: 10 }}
>
<DateTimePicker
label="Start"
sx={theme => ({
Expand All @@ -62,16 +69,13 @@ const PlaySimulationDialog = props => {
'& label': {
transform: 'translate(0px, -9px) scale(0.75)',
},
'&.MuiTextField-root': {
width: '100%',
},
})}
renderInput={params => <TextField {...params} variant="standard" />}
value={playSimulation.start}
onChange={date => setPlaySimulation({ ...playSimulation, start: date })}
slotProps={{
input: {
fullWidth: true,
style: { width: '100%' },
},
}}
/>
{playSimulation.start && <IconButton
onClick={() => setPlaySimulation({ ...playSimulation, start: null })}
Expand Down
2 changes: 1 addition & 1 deletion widgets/fullcalendar/customWidgets.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion widgets/fullcalendar/customWidgets.js.map

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,11 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @mui/styled-engine v6.0.2
*
* @license MIT
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 59163e3

Please sign in to comment.