Merge branch 'develop' into release

mendix · Sep 6, 2019 · b0b7a0e · b0b7a0e
2 parents 9a3da50 + 1aee41a
commit b0b7a0e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,8 @@ theme/
 |       |   ├── base/
 |       |   ├── helpers/
 |       |   ├── widgets/
-|       |   └── _variables.js
+|       |   | _variables.js
+|       |   └── manifest.json
 |       ├── ui_resources/
 |       |   └── atlas_ui_resources/
 |       |       ├── buildingblocks/
@@ -38,7 +39,8 @@ theme/
 |           |   ├── helpers/
 |           |   ├── widgets/
 |           |   ├── widgetscustom/
-|           |   └── _variables.scss
+|           |   |   _variables.scss
+|           |   └── manifest.json
 |           ├── ui_resources/
 |           |   └── atlas_ui_resources/
 |           |       ├── buildingblocks/

diff --git a/styles/web/css/main.css b/styles/web/css/main.css
diff --git a/styles/web/css/main.css.map b/styles/web/css/main.css.map
diff --git a/styles/web/sass/core/_legacy/_mxui.scss b/styles/web/sass/core/_legacy/_mxui.scss
@@ -2925,9 +2925,9 @@ input[type="checkbox"] {
 .mx-window-header {
     cursor: move;
 }
-//.mx-window-body {
-//    overflow: auto;
-//}
+.mx-window-body {
+    overflow: auto;
+}
 
 .mx-dropdown-list * {
     cursor: pointer;

diff --git a/styles/web/sass/core/widgets/_modals.scss b/styles/web/sass/core/widgets/_modals.scss
@@ -52,6 +52,9 @@
 // Default Mendix Window Modal
 .mx-window {
     // If popup direct child is a dataview it gets the class mx-window-view
+    &.mx-window-view.mx-window-active .mx-window-body {
+        overflow:hidden; // hide second scrollbar in edit page
+    }
     &.mx-window-view .mx-window-body {
         padding: 0;
         // Dataview in popup