diff --git a/package.json b/package.json index 4c3275539..99b0e5d34 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@dhis2/d2-i18n": "^1.1.0", "@dhis2/maps-gl": "^3.5.1", "@dhis2/prop-types": "^3.1.2", - "@dhis2/ui": "^8.4.15", + "@dhis2/ui": "^8.7.2", "classnames": "^2.2.6", "final-form-arrays": "^3.0.2", "react-final-form-arrays": "^3.1.3", diff --git a/src/App.module.css b/src/App.module.css index 4ad7b709a..fb623f818 100644 --- a/src/App.module.css +++ b/src/App.module.css @@ -14,6 +14,7 @@ body { .sidebar { grid-column: sidebar; background-color: var(--colors-grey200); + border-right: 1px solid var(--colors-grey400); height: 100%; } diff --git a/src/components/BasicOptions/BasicOptions.module.css b/src/components/BasicOptions/BasicOptions.module.css index 238b92a2c..a38a7a256 100644 --- a/src/components/BasicOptions/BasicOptions.module.css +++ b/src/components/BasicOptions/BasicOptions.module.css @@ -6,9 +6,9 @@ font-size: 18px; font-weight: 500; color: var(--colors-grey900); - margin-bottom: var(--spacers-dp4); + margin: 0 0 var(--spacers-dp4) 0; } .header { - margin: var(--spacers-dp8) 0; + margin: 0 0 var(--spacers-dp8) 0; } diff --git a/src/components/DatePicker/__snapshots__/DatePicker.test.js.snap b/src/components/DatePicker/__snapshots__/DatePicker.test.js.snap index 671589979..7738ea07f 100644 --- a/src/components/DatePicker/__snapshots__/DatePicker.test.js.snap +++ b/src/components/DatePicker/__snapshots__/DatePicker.test.js.snap @@ -7,18 +7,18 @@ exports[`matches snapshot 1`] = ` data-test="date-picker" >
A dry run tests the import settings without importing any data
diff --git a/src/components/JobOverview/JobOverview.js b/src/components/JobOverview/JobOverview.js
index 72b7cdf56..79bbdf1d5 100644
--- a/src/components/JobOverview/JobOverview.js
+++ b/src/components/JobOverview/JobOverview.js
@@ -7,7 +7,7 @@ import { TaskContext } from '../../contexts/index.js'
import { categoryTypes } from '../../utils/tasks.js'
import { JobSummary } from '../index.js'
import { ChipContainer } from './ChipContainer.js'
-import { categoryTypesObj, jobToPath } from './helper.js'
+import { jobToPath } from './helper.js'
import styles from './JobOverview.module.css'
import { MenuLabel } from './MenuLabel/MenuLabel.js'
@@ -65,6 +65,7 @@ const JobOverview = ({
{jsDateToString(task.created)}
+ 2020-02-12 13:00:23
+
-
- {task.completed
- ? i18n.t('Completed')
- : i18n.t('In progress')}{' '}
-
+
-
- Completed
-
+ data1.json
+ 2020-02-12 13:00:23 +