Skip to content

Commit

Permalink
Fix/interpretation sort order [DHIS2-4008] (#221)
Browse files Browse the repository at this point in the history
* set width to interpretation wrapper div

* bump d2-ui-interpretations package
  • Loading branch information
Joakim Amundsen authored Mar 6, 2019
1 parent 2c1eae1 commit f7f0218
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 25 deletions.
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@dhis2/d2-i18n": "^1.0.3",
"@dhis2/d2-ui-core": "5.1.3",
"@dhis2/d2-ui-file-menu": "5.1.3",
"@dhis2/d2-ui-interpretations": "5.2.5",
"@dhis2/d2-ui-interpretations": "5.2.9",
"@dhis2/d2-ui-org-unit-dialog": "5.1.3",
"@dhis2/d2-ui-period-selector-dialog": "5.1.3",
"@dhis2/ui": "^1.0.0-beta.11",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export default {
wrapper: {
position: 'relative',
width: '380px',
},
container: {
position: 'absolute',
Expand Down
48 changes: 24 additions & 24 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@
lodash "^4.17.10"
material-ui "^0.20.0"

"@dhis2/[email protected].5":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-core/-/d2-ui-core-5.2.5.tgz#7a62b23e60e806ae2eae18d6d6b1a3f9415fd1a4"
integrity sha512-44J4JFCYSESQe4Oe1SjJj27o44fwnbXl3XSxJ9lTz+bWaECqQ1HAR+byrKIF4ED+Z+zxOOI/yNi67QnFEWnb1w==
"@dhis2/[email protected].9":
version "5.2.9"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-core/-/d2-ui-core-5.2.9.tgz#7a182d911a0570493dc87febe29bc7ee5ced6503"
integrity sha512-+dpnJ1uTigANCnbUYGAxf9+AYu37UhbREKJhbeZvgZJmsZpa4eRaFFySS+2Y2N+luLeMaN4HaOEiZnQF8Mvv5w==
dependencies:
babel-runtime "^6.26.0"
d2 "~31.4"
Expand Down Expand Up @@ -227,17 +227,17 @@
"@material-ui/icons" "^3.0.1"
prop-types "^15.6.0"

"@dhis2/[email protected].5":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-interpretations/-/d2-ui-interpretations-5.2.5.tgz#347b01b0fb3185547e7163b2089e9ce4c70a67be"
integrity sha512-3Aaj0s4avXF1B7puuxb04Y/TnHV0noa0lGno9IUKsX/q0NP5TRGIs/E9RAKuL7gZvuhSdBuW5t6ZLtXFllMszg==
"@dhis2/[email protected].9":
version "5.2.9"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-interpretations/-/d2-ui-interpretations-5.2.9.tgz#a9aba53f4fa0bfdad11002dd6fa8addace9d0d1b"
integrity sha512-5qEhKY+IvfkDsza9ac74tkYiewKfeQz3ZfA4mZFeT7rbQVIn4g1bI2Hxal2sAkSVxx2Gvc4BcEH1EVUEw8xvMw==
dependencies:
"@dhis2/d2-i18n" "^1.0.3"
"@dhis2/d2-i18n-extract" "^1.0.7"
"@dhis2/d2-i18n-generate" "^1.0.18"
"@dhis2/d2-ui-mentions-wrapper" "5.2.5"
"@dhis2/d2-ui-rich-text" "5.2.5"
"@dhis2/d2-ui-sharing-dialog" "5.2.5"
"@dhis2/d2-ui-mentions-wrapper" "5.2.9"
"@dhis2/d2-ui-rich-text" "5.2.9"
"@dhis2/d2-ui-sharing-dialog" "5.2.9"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
babel-runtime "^6.26.0"
Expand All @@ -249,10 +249,10 @@
recompose "^0.26.0"
rxjs "^5.5.7"

"@dhis2/[email protected].5":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-mentions-wrapper/-/d2-ui-mentions-wrapper-5.2.5.tgz#8940959be239e03af45702d8849df2acd1aa3ff6"
integrity sha512-s8w/nXuZ4RakRpiVjEp/y1Jcq/sah6mqGnfi894hfbPbd6OtforCWwsKI+SySG97w8y7qPzbd8gkhE0UNgIe8Q==
"@dhis2/[email protected].9":
version "5.2.9"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-mentions-wrapper/-/d2-ui-mentions-wrapper-5.2.9.tgz#507f89824b8c2c3ffdacec3759bb98095a631603"
integrity sha512-QVdv5w72FEgrPm83blXAUHVxY97d9KYK1VEBxSKstsHpQZcdAIbjORHj7Uv2yP978+kfUVjxba5UH0M7GkaLWQ==
dependencies:
"@dhis2/d2-i18n" "^1.0.3"
"@material-ui/core" "^3.3.1"
Expand Down Expand Up @@ -297,10 +297,10 @@
react-sortable-hoc "^0.8.4"
redux "^4.0.1"

"@dhis2/[email protected].5":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-rich-text/-/d2-ui-rich-text-5.2.5.tgz#74cb40330c54e25a470d8c29ed2307bb7dc3b4f5"
integrity sha512-2mNU/St2XNF3L4ggqNhgk+UYlSiy43GUT3hjfi4UfjuGyOrSmu/w43g0OMmNdiHGoUngAn0agzorlTFTGLql0Q==
"@dhis2/[email protected].9":
version "5.2.9"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-rich-text/-/d2-ui-rich-text-5.2.9.tgz#67cabce3b001495f53be4f5fb3b3973265e19eb6"
integrity sha512-Gv+ULAmZzVIr7d/S+menDjhawU+JwLhRn1IDOmdlwtUpoiQhi20gXLbxHoCIWt1AmiVTxQRqiEHbHTxv5vFW7w==
dependencies:
babel-runtime "^6.26.0"
markdown-it "^8.4.2"
Expand All @@ -320,12 +320,12 @@
recompose "^0.26.0"
rxjs "^5.5.7"

"@dhis2/[email protected].5":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-sharing-dialog/-/d2-ui-sharing-dialog-5.2.5.tgz#ab0ba34436004aa9e23897a5d1ea5f346bec5601"
integrity sha512-xrmmyV5Tx+pfR88Na+UsDpIdAulPiuSb7yojmu9CUadDEtxAEkyEhd7QRx+hny7wgkaBZJBeR30rdXvvytSayQ==
"@dhis2/[email protected].9":
version "5.2.9"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-sharing-dialog/-/d2-ui-sharing-dialog-5.2.9.tgz#db2586067473ef07ff21e3d962c4db8b528ac595"
integrity sha512-pYAZGazIq760nSHAOH6gO2IpP/sqTc7MFS0RHFgFgFr9l6UvHpy7fEXkFkHYoKbVi7pQLTRRQquBoBdzRcm/Kg==
dependencies:
"@dhis2/d2-ui-core" "5.2.5"
"@dhis2/d2-ui-core" "5.2.9"
"@material-ui/core" "^3.3.1"
"@material-ui/icons" "^3.0.1"
babel-runtime "^6.26.0"
Expand Down

0 comments on commit f7f0218

Please sign in to comment.