update components

This commit is contained in:
Luke Pulverenti 2016-06-29 13:57:57 -04:00
parent 94fd632dd3
commit 0623156e11
2 changed files with 4 additions and 3 deletions

View File

@ -1,4 +1,4 @@
define(['dialogHelper', 'layoutManager', 'globalize', 'emby-button', 'css!./actionsheet', 'material-icons', 'scrollStyles'], function (dialogHelper, layoutManager, globalize) { define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'emby-button', 'css!./actionsheet', 'material-icons', 'scrollStyles'], function (dialogHelper, layoutManager, globalize, browser) {
function parentWithClass(elem, className) { function parentWithClass(elem, className) {
@ -142,8 +142,8 @@
} }
var scrollType = layoutManager.desktop ? 'smoothScrollY' : 'hiddenScrollY'; var scrollType = layoutManager.desktop ? 'smoothScrollY' : 'hiddenScrollY';
var style = (browser.noFlex || browser.firefox) ? ' style="max-height:400px;"' : '';
html += '<div class="actionSheetScroller ' + scrollType + '">'; html += '<div class="actionSheetScroller ' + scrollType + '"' + style + '>';
var i, length, option; var i, length, option;
var renderIcon = false; var renderIcon = false;

View File

@ -60,6 +60,7 @@
[is="emby-button"].noflex { [is="emby-button"].noflex {
display: inline-block; display: inline-block;
white-space: nowrap;
} }
[is="emby-button"].fab.mini:not(.autoSize) { [is="emby-button"].fab.mini:not(.autoSize) {