fix: ui glitches (#618)

* Dimensions panel's scrollbar and padding * Upgraded to Analytics v3.1.1 for various UI fixes
dhis2 · Feb 5, 2020 · 2788daf · 2788daf
1 parent d4c5bc6
commit 2788daf
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -12,7 +12,7 @@
         "redux-mock-store": "^1.5.3"
     },
     "dependencies": {
-        "@dhis2/analytics": "^3.1.0",
+        "@dhis2/analytics": "^3.1.1",
         "@dhis2/d2-ui-core": "^6.5.2",
         "@dhis2/d2-ui-file-menu": "^6.5.2",
         "@dhis2/d2-ui-interpretations": "^6.5.2",

diff --git a/packages/app/src/components/DimensionsPanel/DndDimensionsPanel.js b/packages/app/src/components/DimensionsPanel/DndDimensionsPanel.js
@@ -28,6 +28,7 @@ export class DndDimensionsPanel extends Component {
                         background: '#fff',
                         border: `1px solid ${colors.grey400}`,
                         borderRadius: '5px',
+                        marginRight: '8px',
                     }}
                     placeholder={i18n.t('Filter dimensions')}
                     text={this.state.filterText}

diff --git a/packages/app/src/components/DimensionsPanel/styles/DndDimensionList.module.css b/packages/app/src/components/DimensionsPanel/styles/DndDimensionList.module.css
@@ -10,7 +10,7 @@
     height: 100%;
     overflow: auto;
     margin-top: 0px;
-    padding: 0;
+    padding-right: 8px;
 }
 
 .list {

diff --git a/packages/app/src/components/DimensionsPanel/styles/DndDimensionsPanel.module.css b/packages/app/src/components/DimensionsPanel/styles/DndDimensionsPanel.module.css
@@ -3,6 +3,6 @@
     display: flex;
     flex-direction: column;
     background-color: #f4f6f8;
-    padding: 8px 8px 0 8px;
+    padding: 8px 0 0 8px;
     overflow: hidden;
 }
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
@@ -6,7 +6,7 @@
     "module": "./build/es/lib.js",
     "license": "BSD-3-Clause",
     "dependencies": {
-        "@dhis2/analytics": "^3.1.0",
+        "@dhis2/analytics": "^3.1.1",
         "@material-ui/core": "^3.1.2",
         "d2-analysis": "33.2.11",
         "lodash-es": "^4.17.11",

diff --git a/yarn.lock b/yarn.lock
@@ -1442,10 +1442,10 @@
     react-beautiful-dnd "^10.1.1"
     styled-jsx "^3.2.1"
 
-"@dhis2/analytics@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-3.1.0.tgz#1e9ad696b5e1e1c44accac932d5f447e9bd22d49"
-  integrity sha512-cLCE8yMFZ1I7DNOuIBNmVc8taKOw82sZVdxmSz3f9zAxKXnH8UT58lhOBE3nwJu95R5C4lJHrpMkJY81Gy7O0w==
+"@dhis2/analytics@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-3.1.1.tgz#d1748b169b36e90ee71550c179900c8962b752b8"
+  integrity sha512-64p818t8hst1nu/+xWVsaWO/gs9CxLgbE9MerHwYgmxjTlqCYvNaEuWwxeorb6lnjGnd+LPiH1k+AN7Fsh0JYg==
   dependencies:
     "@dhis2/d2-i18n" "^1.0.4"
     "@dhis2/d2-ui-org-unit-dialog" "^6.3.2"