mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update latest items

Browse source
This commit is contained in:
Luke Pulverenti 2016-11-05 15:34:03 -04:00
parent 30ad844e37
commit 3c571f5ded
8 changed files with 40 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.330",
"_release": "1.4.330",
"version": "1.4.331",
"_release": "1.4.331",
"_resolution": {
"type": "version",
"tag": "1.4.330",
"commit": "14b8b8dd7303142a641995e0cd31a0972786399f"
"tag": "1.4.331",
"commit": "922ebb6b3119283fbe0585ccc1b71b87f26bb8ee"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

2
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css vendored
View file

@ -107,7 +107,7 @@ button {
.btnCardOptions {
position: absolute;
bottom: 0;
bottom: .25em;
right: 0;
margin: 0 !important;
z-index: 1;

11
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -689,7 +689,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
return 'defaultCardColor' + getDefaultColorIndex(str);
}
function getCardTextLines(lines, cssClass, forceLines, isOuterFooter, cardLayout, addRightMargin) {
function getCardTextLines(lines, cssClass, forceLines, isOuterFooter, cardLayout, addRightMargin, maxLines) {
var html = '';
@ -714,10 +714,17 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
html += text;
html += "</div>";
valid++;
if (maxLines && valid >= maxLines) {
break;
}
}
}
if (forceLines) {
length = Math.min(lines.length, maxLines || lines.length);
while (valid < length) {
html += "<div class='" + cssClass + "'>&nbsp;</div>";
valid++;
@ -985,7 +992,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
lines = [];
}
html += getCardTextLines(lines, cssClass, !options.overlayText, isOuterFooter, options.cardLayout, isOuterFooter && options.cardLayout && !options.centerText);
html += getCardTextLines(lines, cssClass, !options.overlayText, isOuterFooter, options.cardLayout, isOuterFooter && options.cardLayout && !options.centerText, options.lines);
if (progressHtml) {
html += progressHtml;

2
dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css vendored
View file

@ -152,7 +152,7 @@
.paper-icon-button-light > i {
width: 1em;
height: 1em;
font-size: 1.7em;
font-size: 1.6em;
/* Make sure its on top of the ripple */
position: relative;
z-index: 1;

5
dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css vendored
View file

@ -24,6 +24,8 @@ _:-ms-input-placeholder, :root .mdl-slider {
z-index: 1;
cursor: pointer;
margin: 0;
/* Disable webkit tap highlighting */
-webkit-tap-highlight-color: rgba(0,0,0,0);
/**************************** Tracks ****************************/
/**************************** Thumbs ****************************/
/**************************** 0-value ****************************/
@ -224,6 +226,7 @@ _:-ms-input-placeholder, :root .mdl-slider {
align-items: center;
justify-content: center;
}
.sliderBubbleText {
margin: 0;
}
}