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

fix: update info icons [DHIS2-10834] (v39) #1293

Merged
merged 1 commit into from
Dec 15, 2023
Merged

fix: update info icons [DHIS2-10834] (v39) #1293

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
32 changes: 13 additions & 19 deletions src/settingsFields.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import i18n from '@dhis2/d2-i18n'
import { Button, Card, CenteredContent, CircularLoader } from '@dhis2/ui'
import {
Button,
Card,
CenteredContent,
CircularLoader,
IconInfo24,
Tooltip,
} from '@dhis2/ui'
import FormBuilder from 'd2-ui/lib/forms/FormBuilder.component.js'
import { wordToValidatorMap } from 'd2-ui/lib/forms/Validators.js'
import IconButton from 'material-ui/IconButton'
import PropTypes from 'prop-types'
import React from 'react'
import configOptionStore from './configOptionStore.js'
Expand Down Expand Up @@ -36,7 +42,7 @@ const styles = {
color: AppTheme.rawTheme.palette.primary1Color,
position: 'absolute',
right: 0,
top: 24,
top: 36,
},
menuIcon: {
color: '#757575',
Expand Down Expand Up @@ -85,24 +91,12 @@ function wrapUserSettingsOverride({ component, valueLabel }) {
: i18n.t('This setting can be overridden by user settings')

return (
<div style={{ marginRight: 48 }}>
<div style={{ marginRight: 36 }}>
{super.render()}
<div style={labelStyle}>
<IconButton
iconClassName="material-icons"
tooltip={labelText}
tooltipPosition="bottom-left"
iconStyle={{
color: AppTheme.rawTheme.palette.primary1Color,
}}
tooltipStyles={{
fontSize: '.75rem',
marginRight: 32,
marginTop: -32,
}}
>
info_outline
</IconButton>
<Tooltip content={labelText}>
<IconInfo24 />
</Tooltip>
</div>
</div>
)
Expand Down
Loading