diff --git a/CHANGELOG.md b/CHANGELOG.md index 6efa0cb42..627eb1221 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Fixed issue in admin where overrides for Enabled toggle wouldn't be showing checked, causing the value to reset to Base Outline - Fixed Admin Styles issue where indicator wouldn't show in certain cases. - Fixed `.equal-height` utility not fully expanding the content (#902) + - Reverted Assignments scrollbars due to Chrome issue [we will re-enable the functionality as soon as the bug is fixed] (#851) 3. [WordPress](#wordpress) 3. [](#bugfix) - Renaming of Outlines from navigation bar will now properly refresh all links with the new value (#912) diff --git a/platforms/common/application/assignments/index.js b/platforms/common/application/assignments/index.js index ae82672de..c1d3a5bf8 100644 --- a/platforms/common/application/assignments/index.js +++ b/platforms/common/application/assignments/index.js @@ -187,7 +187,7 @@ ready(function() { body.delegate('change', '[data-assignments-enabledonly]', Assignments.filterEnabledOnly); // chrome workaround for overflow and columns - if (Assignments.isChrome()) Assignments.chromeFix(); + //if (Assignments.isChrome()) Assignments.chromeFix(); }); module.exports = Assignments; diff --git a/platforms/common/css-compiled/admin.css b/platforms/common/css-compiled/admin.css index 8b627e465..fe5af57b2 100644 --- a/platforms/common/css-compiled/admin.css +++ b/platforms/common/css-compiled/admin.css @@ -1503,6 +1503,9 @@ display: -ms-flexbox; display: flex; } +#g5-container .equal-height .g-content { + width: 100%; +} #g5-container #g-offcanvas { position: fixed; top: 0; @@ -2845,9 +2848,9 @@ i.fa-grav, i.fa-grav-spaceman, i.fa-grav-text, i.fa-grav-full { } #g5-container #assignments .settings-param-wrapper { min-width: 100%; - max-height: 455px; + /*max-height: 455px; overflow-y: auto; - overflow-x: hidden; + overflow-x: hidden;*/ margin: 0 -10px -10px; } #g5-container #assignments .settings-param { diff --git a/platforms/common/js/main.js b/platforms/common/js/main.js index 209fcb6fe..bdfcf89d1 100644 --- a/platforms/common/js/main.js +++ b/platforms/common/js/main.js @@ -281,7 +281,7 @@ ready(function() { body.delegate('change', '[data-assignments-enabledonly]', Assignments.filterEnabledOnly); // chrome workaround for overflow and columns - if (Assignments.isChrome()) Assignments.chromeFix(); + //if (Assignments.isChrome()) Assignments.chromeFix(); }); module.exports = Assignments; diff --git a/platforms/common/scss/admin/_assignments.scss b/platforms/common/scss/admin/_assignments.scss index 0d7ffb44b..d395292e1 100644 --- a/platforms/common/scss/admin/_assignments.scss +++ b/platforms/common/scss/admin/_assignments.scss @@ -6,9 +6,10 @@ .settings-param-wrapper { min-width: 100%; - max-height: 455px; + // Overflow disabled until Chrome issue fixed (see #851) + /*max-height: 455px; overflow-y: auto; - overflow-x: hidden; + overflow-x: hidden;*/ margin: 0 -10px -10px; }