Skip to content

Commit

Permalink
Reverted displaying scrollbars in Assignments until Blink issue gets …
Browse files Browse the repository at this point in the history
…resolved (#851)
  • Loading branch information
w00fz committed Oct 20, 2015
1 parent 9c7f566 commit c609742
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion platforms/common/application/assignments/index.js
Expand Up @@ -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;
7 changes: 5 additions & 2 deletions platforms/common/css-compiled/admin.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion platforms/common/js/main.js
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions platforms/common/scss/admin/_assignments.scss
Expand Up @@ -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;
}

Expand Down

0 comments on commit c609742

Please sign in to comment.