Skip to content

Commit

Permalink
fix: manual clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
tomzemp committed Oct 17, 2024
1 parent bb927fb commit 1d95793
Show file tree
Hide file tree
Showing 10 changed files with 140 additions and 1,838 deletions.
1 change: 1 addition & 0 deletions d2.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const config = {
entryPoints: {
app: './src/app/app-wrapper.js',
},
direction: 'auto',
}

module.exports = config
9 changes: 7 additions & 2 deletions i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2024-10-16T08:10:10.883Z\n"
"PO-Revision-Date: 2024-10-16T08:10:10.883Z\n"
"POT-Creation-Date: 2024-10-17T12:07:03.346Z\n"
"PO-Revision-Date: 2024-10-17T12:07:03.347Z\n"

msgid "Not authorized"
msgstr "Not authorized"
Expand Down Expand Up @@ -572,6 +572,11 @@ msgstr "Type here to filter in this section"
msgid "1 item hidden by filter"
msgstr "1 item hidden by filter"

msgid "{{count}} items hidden by filter"
msgid_plural "{{count}} items hidden by filter"
msgstr[0] "{{count}} items hidden by filter"
msgstr[1] "{{count}} items hidden by filter"

msgid "{{pendingMutations}} change saved locally"
msgstr "{{pendingMutations}} change saved locally"

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"jgs:start": "BROWSER=none yarn start --proxy https://debug.dhis2.org/dev"
},
"devDependencies": {
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@badeball/cypress-cucumber-preprocessor": "^16.0.0",
"@cypress/webpack-preprocessor": "^5.17.0",
"@dhis2/cli-app-scripts": "^11.7.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const IconizedCheckbox = ({
<style jsx>{`
span {
display: inline-block;
margin-right: 4px;
margin-inline-end: 4px;
}
`}</style>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const LabelContainer = ({ highlighted, children }) => (
.highlighted {
background: ${colors.teal200};
padding-right: 4px;
padding-inline-end: 4px;
}
`}</style>
</div>
Expand Down
17 changes: 15 additions & 2 deletions src/context-selection/period-selector-bar-item/year-navigator.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import i18n from '@dhis2/d2-i18n'
import { Button, IconArrowRight24, IconArrowLeft24 } from '@dhis2/ui'
import PropTypes from 'prop-types'
import React from 'react'
Expand All @@ -17,7 +18,13 @@ export default function YearNavigator({
dataTest="yearnavigator-backbutton"
disabled={year <= startYear}
onClick={() => onYearChange(year - 1)}
icon={<IconArrowLeft24 />}
icon={
i18n.dir() === 'rtl' ? (
<IconArrowRight24 />
) : (
<IconArrowLeft24 />
)
}
/>
<span
data-test="yearnavigator-currentyear"
Expand All @@ -29,7 +36,13 @@ export default function YearNavigator({
dataTest="yearnavigator-forwardbutton"
disabled={year >= maxYear}
onClick={() => onYearChange(year + 1)}
icon={<IconArrowRight24 />}
icon={
i18n.dir() === 'rtl' ? (
<IconArrowLeft24 />
) : (
<IconArrowRight24 />
)
}
/>
</div>
)
Expand Down
7 changes: 6 additions & 1 deletion src/data-workspace/data-details-sidebar/audit-log.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,12 @@ function UpdatedValue({ value, previousValue }) {
<div className={styles.alignToEnd}>
{previousValue && <Tag>{previousValue}</Tag>}
{/* arrow-right*/}
<span className={styles.rightArrow}>&rarr;</span>
{i18n.dir() === 'rtl' ? (
<span className={styles.rightArrow}>&larr;</span>
) : (
<span className={styles.rightArrow}>&rarr;</span>
)}

<Tag>{value}</Tag>
</div>
)
Expand Down
8 changes: 6 additions & 2 deletions src/data-workspace/inputs/inputs.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@
inline-size: 100%;
}
.cellPadding {
padding: 8px 16px 8px 8px;
padding-block: 8px;
padding-inline-start: 16px;
padding-inline-end: 8px;
}
.whiteButton {
background-color: #fff !important;
}
/* For use in non-text cells: */
.densePadding {
padding: 1px 16px 1px 8px;
padding-block: 1px;
padding-inline-start: 16px;
padding-inline-end: 8px;
}

.basicInput {
Expand Down
4 changes: 3 additions & 1 deletion src/data-workspace/table-body.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@

.table td {
block-size: 32px;
padding: 8px 16px 8px 8px;
padding-block: 8px;
padding-inline-start: 8px;
padding-inline-end: 8px;
}

.paddingCell {
Expand Down
Loading

0 comments on commit 1d95793

Please sign in to comment.