update components

This commit is contained in:
Luke Pulverenti 2016-09-07 17:08:40 -04:00
parent 46043aae83
commit 1eb2690523
10 changed files with 39 additions and 47 deletions

View File

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.227", "version": "1.4.228",
"_release": "1.4.227", "_release": "1.4.228",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.227", "tag": "1.4.228",
"commit": "2505460646b01598627d65be60949d0ca0422b9f" "commit": "1cfdbd2cf131d65f407bb004f8840f8b0cb929ea"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

View File

@ -89,3 +89,9 @@
.actionsheet-extraSpacing { .actionsheet-extraSpacing {
font-size: 108%; font-size: 108%;
} }
.btnCloseActionSheet {
position: fixed;
top: .5em;
left: .25em;
}

View File

@ -155,6 +155,10 @@
} }
} }
if (layoutManager.tv) {
html += '<button is="paper-icon-button-light" class="btnCloseActionSheet" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
}
// If any items have an icon, give them all an icon just to make sure they're all lined up evenly // If any items have an icon, give them all an icon just to make sure they're all lined up evenly
var center = options.title && (!renderIcon /*|| itemsWithIcons.length != options.items.length*/); var center = options.title && (!renderIcon /*|| itemsWithIcons.length != options.items.length*/);
@ -215,7 +219,7 @@
if (options.showCancel) { if (options.showCancel) {
html += '<div class="buttons">'; html += '<div class="buttons">';
html += '<button is="emby-button" type="button" class="btnCancel">' + globalize.translate('sharedcomponents#ButtonCancel') + '</button>'; html += '<button is="emby-button" type="button" class="btnCloseActionSheet">' + globalize.translate('sharedcomponents#ButtonCancel') + '</button>';
html += '</div>'; html += '</div>';
} }
html += '</div>'; html += '</div>';
@ -226,8 +230,9 @@
centerFocus(dlg.querySelector('.actionSheetScroller'), false, true); centerFocus(dlg.querySelector('.actionSheetScroller'), false, true);
} }
if (options.showCancel) { var btnCloseActionSheet = dlg.querySelector('.btnCloseActionSheet');
dlg.querySelector('.btnCancel').addEventListener('click', function () { if (btnCloseActionSheet) {
dlg.querySelector('.btnCloseActionSheet').addEventListener('click', function () {
dialogHelper.close(dlg); dialogHelper.close(dlg);
}); });
} }

View File

@ -3,12 +3,13 @@
} }
.collapseContent { .collapseContent {
border-width: 0 1px 1px 1px; border-width: 0;
padding: 1.25em 1.25em; padding: 1.25em 1.25em;
height: 0; height: 0;
transition-property: height; transition-property: height;
transition-duration: 300ms; transition-duration: 300ms;
overflow: hidden; overflow: hidden;
background: #222;
} }
.emby-collapsible-button { .emby-collapsible-button {
@ -18,6 +19,9 @@
text-transform: none; text-transform: none;
width: 100%; width: 100%;
text-align: left; text-align: left;
border: 0;
text-transform: none;
border-bottom: 1px solid #333;
} }
.emby-collapse-expandIcon { .emby-collapse-expandIcon {
@ -28,3 +32,8 @@
.emby-collapse-expandIconExpanded { .emby-collapse-expandIconExpanded {
transform: rotate(180deg); transform: rotate(180deg);
} }
.emby-collapsible-title {
margin: 0;
padding: 0;
}

View File

@ -59,7 +59,7 @@
} }
.newTvProgram { .newTvProgram {
background: #43A047; background: #64A239;
} }
.liveTvProgram { .liveTvProgram {

View File

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0", "web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/PolymerElements/iron-icon", "homepage": "https://github.com/polymerelements/iron-icon",
"_release": "1.0.10", "_release": "1.0.10",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.10", "tag": "v1.0.10",
"commit": "f4e146da4982ff96bb25db85290c09e8de4ec734" "commit": "f4e146da4982ff96bb25db85290c09e8de4ec734"
}, },
"_source": "git://github.com/PolymerElements/iron-icon.git", "_source": "git://github.com/polymerelements/iron-icon.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-icon" "_originalSource": "polymerelements/iron-icon"
} }

View File

@ -27,14 +27,14 @@
}, },
"main": "iron-meta.html", "main": "iron-meta.html",
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/iron-meta", "homepage": "https://github.com/PolymerElements/iron-meta",
"_release": "1.1.2", "_release": "1.1.2",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.2", "tag": "v1.1.2",
"commit": "bae96531b63ea6d4ce982f5592248aea849c0f5a" "commit": "bae96531b63ea6d4ce982f5592248aea849c0f5a"
}, },
"_source": "git://github.com/polymerelements/iron-meta.git", "_source": "git://github.com/PolymerElements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-meta" "_originalSource": "PolymerElements/iron-meta"
} }

View File

@ -40,6 +40,6 @@
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
}, },
"_source": "git://github.com/Polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0", "_target": "^1.5.0",
"_originalSource": "Polymer/polymer" "_originalSource": "Polymer/polymer"
} }

View File

@ -562,24 +562,6 @@ progress {
background-color: #e8e8e8; background-color: #e8e8e8;
} }
.ui-body-b .emby-collapsible-button {
border: 0;
background-color: #333;
text-transform: none;
}
.ui-body-b .emby-collapsible-title {
margin: 0;
color: #fff;
padding: 0 0 0 .5em;
font-weight: 500;
}
.ui-body-b .emby-collapsible-content, .ui-body-b .collapseContent {
border-width: 0;
background-color: #222;
}
.ui-body-a select { .ui-body-a select {
background: none; background: none;
border-color: #757575; border-color: #757575;
@ -590,20 +572,10 @@ progress {
} }
.ui-body-a .emby-collapsible-button { .ui-body-a .emby-collapsible-button {
border: 0; border-color: #ddd;
background-color: #e8e8e8;
text-transform: none;
} }
.ui-body-a .emby-collapsible-title { .ui-body-a .collapseContent {
margin: .15em 0;
color: #333;
padding: 0 0 0 .5em;
font-weight: 500;
}
.ui-body-a .emby-collapsible-content, .ui-body-a .collapseContent {
border-width: 0;
background-color: #fff; background-color: #fff;
} }

View File

@ -152,7 +152,7 @@ div.dialogHeader {
} }
.ui-body-a div.formDialogFooter { .ui-body-a div.formDialogFooter {
background-color: #ddd; background-color: #e0e0e0;
color: inherit; color: inherit;
} }