Skip to content

Commit d12693b

Browse files
authored
Merge pull request #2608 from farodin91/cleanup-general-settings
frontend: cleanup general settings
2 parents 877d8e1 + 6311413 commit d12693b

File tree

6 files changed

+16
-26
lines changed

6 files changed

+16
-26
lines changed

frontend/src/components/App/Settings/Settings.tsx

-8
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,6 @@ export default function Settings() {
4848
backLink
4949
>
5050
<NameValueTable
51-
valueCellProps={{
52-
sx: theme => ({
53-
width: '60%',
54-
[theme.breakpoints.down('sm')]: {
55-
width: 'unset',
56-
},
57-
}),
58-
}}
5951
rows={[
6052
{
6153
name: t('translation|Language'),

frontend/src/components/App/Settings/ThemeChangeButton.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ export default function ThemeChangeButton(props: { showBothIcons?: boolean }) {
5656
'& button': {
5757
boxShadow: 'none',
5858
borderRadius: '4px',
59-
padding: '0.8rem 1.5rem',
6059
},
6160
'& .MuiButton-contained': {
6261
backgroundColor: theme.palette.mode === 'dark' ? '#fff' : 'rgba(0, 0, 0, 0.45)',

frontend/src/components/App/Settings/__snapshots__/Settings.General.stories.storyshot

+13-14
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@
7676
Language
7777
</dt>
7878
<dd
79-
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-9f9ori-MuiGrid-root"
79+
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
8080
>
8181
<div
82-
class="MuiFormControl-root css-k2e4wk-MuiFormControl-root"
82+
class="MuiFormControl-root css-1nrlq1o-MuiFormControl-root"
8383
>
8484
<div
8585
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-formControl css-16kq2pe-MuiInputBase-root-MuiInput-root-MuiSelect-root"
@@ -123,10 +123,10 @@
123123
Theme
124124
</dt>
125125
<dd
126-
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-9f9ori-MuiGrid-root"
126+
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
127127
>
128128
<div
129-
class="MuiButtonGroup-root MuiButtonGroup-outlined css-1b41vff-MuiButtonGroup-root"
129+
class="MuiButtonGroup-root MuiButtonGroup-outlined css-1o97n10-MuiButtonGroup-root"
130130
role="group"
131131
>
132132
<button
@@ -157,7 +157,7 @@
157157
Number of rows for tables
158158
</dt>
159159
<dd
160-
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-9f9ori-MuiGrid-root"
160+
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
161161
>
162162
<div
163163
class="MuiFormControl-root css-1nrlq1o-MuiFormControl-root"
@@ -203,7 +203,7 @@
203203
Timezone to display for dates
204204
</dt>
205205
<dd
206-
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-9f9ori-MuiGrid-root"
206+
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-1xrovmc-MuiGrid-root"
207207
>
208208
<div
209209
class="MuiBox-root css-10rqxfs"
@@ -214,19 +214,12 @@
214214
<div
215215
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-wb57ya-MuiFormControl-root-MuiTextField-root"
216216
>
217-
<label
218-
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-standard MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-sizeMedium MuiInputLabel-standard css-zh08sj-MuiFormLabel-root-MuiInputLabel-root"
219-
data-shrink="false"
220-
for="cluster-selector-autocomplete"
221-
id="cluster-selector-autocomplete-label"
222-
>
223-
Timezone
224-
</label>
225217
<div
226218
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-adornedEnd MuiAutocomplete-inputRoot css-lbi814-MuiInputBase-root-MuiInput-root"
227219
>
228220
<input
229221
aria-autocomplete="both"
222+
aria-describedby="cluster-selector-autocomplete-helper-text"
230223
aria-expanded="false"
231224
aria-invalid="false"
232225
autocapitalize="none"
@@ -265,6 +258,12 @@
265258
</button>
266259
</div>
267260
</div>
261+
<p
262+
class="MuiFormHelperText-root MuiFormHelperText-sizeMedium css-nnd8o8-MuiFormHelperText-root"
263+
id="cluster-selector-autocomplete-helper-text"
264+
>
265+
Timezone
266+
</p>
268267
</div>
269268
</div>
270269
</div>

frontend/src/components/common/TimezoneSelect/TimezoneSelect.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default function TimezoneSelect(props: TimezoneSelectorProps) {
3434
autoComplete
3535
includeInputInList
3636
openOnFocus
37-
renderInput={params => <TextField {...params} label={t('Timezone')} />}
37+
renderInput={params => <TextField {...params} helperText={t('Timezone')} />}
3838
onChange={(_ev, value) => onChange(value.name)}
3939
value={timezoneOptions.find(option => option.name === initialTimezone)}
4040
/>

frontend/src/i18n/LocaleSelect/LocaleSelect.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default function LocaleSelect(props: LocaleSelectProps) {
5656
const extraInputProps = import.meta.env.UNDER_TEST ? { 'aria-controls': 'under-test' } : {};
5757

5858
return (
59-
<FormControl sx={{ margin: theme.spacing(2) }} {...formControlProps}>
59+
<FormControl {...formControlProps}>
6060
{props.showTitle && <FormLabel component="legend">{t('Select locale')}</FormLabel>}
6161
<Select
6262
value={i18n.language ? i18n.language : 'en'}

frontend/src/i18n/LocaleSelect/__snapshots__/LocaleSelect.Initial.stories.storyshot

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<body>
22
<div>
33
<div
4-
class="MuiFormControl-root css-k2e4wk-MuiFormControl-root"
4+
class="MuiFormControl-root css-1nrlq1o-MuiFormControl-root"
55
>
66
<div
77
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-formControl css-16kq2pe-MuiInputBase-root-MuiInput-root-MuiSelect-root"

0 commit comments

Comments
 (0)