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 fonts

Browse source
This commit is contained in:
Luke Pulverenti 2016-03-12 15:16:42 -05:00
parent dfac46b2ca
commit 9401f38a57
77 changed files with 566 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/scripts/metadataimagespage.js
View file

@ -361,15 +361,15 @@
html += '<li data-mini="true" class="localReaderOption" data-pluginname="' + plugin.Name + '">';
if (i > 0) {
html += '<a href="#" style="font-size:13px;font-weight:normal;">' + plugin.Name + '</a>';
html += '<a href="#" style="font-weight:normal;">' + plugin.Name + '</a>';
html += '<a class="btnLocalReaderUp btnLocalReaderMove" data-pluginindex="' + i + '" href="#" style="font-size:13px;font-weight:normal;" data-icon="arrow-u">' + Globalize.translate('ButtonUp') + '</a>';
html += '<a class="btnLocalReaderUp btnLocalReaderMove" data-pluginindex="' + i + '" href="#" style="font-weight:normal;" data-icon="arrow-u">' + Globalize.translate('ButtonUp') + '</a>';
}
else if (plugins.length > 1) {
html += '<a href="#" style="font-size:13px;font-weight:normal;">' + plugin.Name + '</a>';
html += '<a href="#" style="font-weight:normal;">' + plugin.Name + '</a>';
html += '<a class="btnLocalReaderDown btnLocalReaderMove" data-pluginindex="' + i + '" href="#" style="font-size:13px;font-weight:normal;" data-icon="arrow-d">' + Globalize.translate('ButtonDown') + '</a>';
html += '<a class="btnLocalReaderDown btnLocalReaderMove" data-pluginindex="' + i + '" href="#" style="font-weight:normal;" data-icon="arrow-d">' + Globalize.translate('ButtonDown') + '</a>';
}
else {

17
dashboard-ui/scripts/site.js
View file

@ -1633,10 +1633,14 @@ var AppInfo = {};
}
function setDocumentClasses() {
function setDocumentClasses(browser) {
var elem = document.documentElement;
if (!browser.android && !browser.mobile) {
elem.classList.add('smallerDefault');
}
if (AppInfo.isTouchPreferred) {
elem.classList.add('touch');
}
@ -1910,6 +1914,10 @@ var AppInfo = {};
define("userSettings", [embyWebComponentsBowerPath + "/usersettings"], returnFirstDependency);
define("material-design-lite", [bowerPath + "/material-design-lite/material.min", "css!" + bowerPath + "/material-design-lite/material"]);
define("robotoFont", ['css!' + embyWebComponentsBowerPath + '/fonts/roboto/style']);
define("opensansFont", ['css!' + embyWebComponentsBowerPath + '/fonts/opensans/style']);
define("montserratFont", ['css!' + embyWebComponentsBowerPath + '/fonts/montserrat/style']);
// alias
define("historyManager", [], function () {
return {
@ -2302,6 +2310,11 @@ var AppInfo = {};
postInitDependencies.push('components/remotecontrolautoplay');
// Prefer OpenSans over Segoe if on desktop windows
if (!browserInfo.mobile && navigator.userAgent.toLowerCase().indexOf('windows') != -1) {
postInitDependencies.push('opensansFont');
}
require(postInitDependencies);
});
}
@ -2427,7 +2440,7 @@ var AppInfo = {};
window.browserInfo = browser;
setAppInfo();
setDocumentClasses();
setDocumentClasses(browser);
getHostingAppInfo().then(init);
});

2
dashboard-ui/scripts/userlibraryaccess.js
View file

@ -81,7 +81,7 @@
html += '<input class="chkDevice" data-id="' + device.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />';
html += '<label for="' + id + '">' + device.Name;
html += '<br/><span style="font-weight:normal;font-size: 90%;">' + device.AppName + '</span>';
html += '<br/><span>' + device.AppName + '</span>';
html += '</label>';
}