milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update buttons

Browse source
This commit is contained in:
Luke Pulverenti 2016-06-04 20:17:35 -04:00
parent 467ff3657f
commit 3a045a664b
33 changed files with 360 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css vendored
View file

@ -27,7 +27,7 @@
text-align: center;
}
.actionSheetMenuItem {
button.actionSheetMenuItem {
padding: 0 1.6em;
margin: 0;
text-transform: none;
@ -35,13 +35,14 @@
display: flex;
font-weight: inherit;
align-items: center;
flex-shrink: 0;
}
.actionSheetItemText {
padding: .8em 0;
}
.layout-tv .actionSheetMenuItem {
.layout-tv button.actionSheetMenuItem {
padding-top: .16em;
padding-bottom: .16em;
}
@ -53,6 +54,8 @@
.actionSheetScroller {
/* Override default style being applied by polymer */
margin-bottom: 0 !important;
display: flex;
flex-direction: column;
}
.layout-tv .actionSheetScroller {

8
dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js vendored
View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'layoutManager', 'globalize', 'paper-button', 'css!./actionsheet', 'html!./../icons/nav.html', 'scrollStyles'], function (dialogHelper, layoutManager, globalize) {
define(['dialogHelper', 'layoutManager', 'globalize', 'emby-button', 'css!./actionsheet', 'html!./../icons/nav.html', 'scrollStyles'], function (dialogHelper, layoutManager, globalize) {
function parentWithClass(elem, className) {
@ -151,14 +151,14 @@
dlg.classList.add('centered');
}
var itemTagName = 'paper-button';
var itemTagName = 'button';
for (i = 0, length = options.items.length; i < length; i++) {
option = options.items[i];
var autoFocus = option.selected ? ' autoFocus' : '';
html += '<' + itemTagName + autoFocus + ' class="actionSheetMenuItem" data-id="' + (option.id || option.value) + '">';
html += '<' + itemTagName + autoFocus + ' is="emby-button" type="button" class="actionSheetMenuItem" data-id="' + (option.id || option.value) + '">';
if (option.ironIcon) {
html += '<iron-icon class="actionSheetItemIcon" icon="' + option.ironIcon + '"></iron-icon>';
@ -172,7 +172,7 @@
if (options.showCancel) {
html += '<div class="buttons">';
html += '<paper-button class="btnCancel">' + globalize.translate('sharedcomponents#ButtonCancel') + '</paper-button>';
html += '<button is="emby-button" type="button" class="btnCancel">' + globalize.translate('sharedcomponents#ButtonCancel') + '</button>';
html += '</div>';
}
html += '</div>';