From 6b21f2fbd0af065f0455a65cdb1b0d89ef02a1f7 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 4 Sep 2015 16:32:20 -0400 Subject: [PATCH] update page background --- dashboard-ui/css/librarybrowser.css | 3 +- dashboard-ui/scripts/librarybrowser.js | 14 +- dashboard-ui/scripts/site.js | 18 +- dashboard-ui/themes/android.css | 2 +- .../jquery.mobile.custom.js | 3 +- dashboard-ui/vulcanize-out.html | 954 +++++++++++++++++- 6 files changed, 972 insertions(+), 22 deletions(-) diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 38d2059aaa..468978c13f 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -1532,7 +1532,8 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .itemsListview .content-icon { - display: none !important; + width: auto !important; + padding-right: .7em; } .itemsListview paper-item-body { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index c1c2e5f9aa..56178cf105 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1136,17 +1136,23 @@ var minLazyIndex = 16; if (options.smallIcon) { if (index < minLazyIndex) { - html += '
'; + html += '
'; } else { - html += '
'; + html += '
'; } } else { if (index < minLazyIndex) { - html += '
'; + html += '
'; } else { - html += '
'; + html += '
'; } } + } else { + if (options.smallIcon) { + html += '
'; + } else { + html += '
'; + } } var textlines = []; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 0a8bb3526b..17b938b569 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -2267,6 +2267,7 @@ $(document).on('pagecreate', ".page", function () { var page = $(this); var current = page.data('theme'); + if (!current) { var newTheme; @@ -2282,13 +2283,16 @@ $(document).on('pagecreate', ".page", function () { if (current && current != newTheme) { page.page("option", "theme", newTheme); } - - current = newTheme; } +}).on('pageshow', ".page", function () { + + var page = this; + + var currentTheme = page.classList.contains('ui-page-theme-a') ? 'a' : 'b'; var docElem = document.documentElement; - if (current == 'a') { + if (currentTheme == 'a') { docElem.classList.add('background-theme-a'); docElem.classList.remove('background-theme-b'); } else { @@ -2296,16 +2300,12 @@ $(document).on('pagecreate', ".page", function () { docElem.classList.remove('background-theme-a'); } - if (current != 'a' && !$.browser.mobile) { + if (currentTheme != 'a' && !$.browser.mobile) { document.body.classList.add('darkScrollbars'); } else { document.body.classList.remove('darkScrollbars'); } -}).on('pageshow', ".page", function () { - - var page = this; - var isWizardPage = page.classList.contains('wizardPage'); Dashboard.ensurePageTitle(page); @@ -2320,7 +2320,7 @@ $(document).on('pagecreate', ".page", function () { var isSettingsPage = page.classList.contains('type-interior'); if (isSettingsPage) { - require(['jqmicons']); + require(['jqmicons', 'jqmlistview']); Dashboard.ensureToolsMenu(page); Dashboard.getCurrentUser().done(function (user) { diff --git a/dashboard-ui/themes/android.css b/dashboard-ui/themes/android.css index 748a389f6f..d0bc40a84e 100644 --- a/dashboard-ui/themes/android.css +++ b/dashboard-ui/themes/android.css @@ -1,4 +1,4 @@ -.viewMenuBar, .libraryViewNav:not(.paperLibraryViewNav), paper-tabs, html { +.viewMenuBar, .libraryViewNav:not(.paperLibraryViewNav), paper-tabs { background-color: #1b1b1b; } diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js index 02a54f6d17..358587cf4e 100644 --- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js +++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js @@ -4068,7 +4068,8 @@ $.fn.fieldcontain = function(/* options */) { dependencies = dependencies || []; dependencies.push('jqmicons'); dependencies.push('jqmpopup'); - } + dependencies.push('jqmlistview'); + } var currentSelf = this; diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html index dd02e0f478..9e3e9c943c 100644 --- a/dashboard-ui/vulcanize-out.html +++ b/dashboard-ui/vulcanize-out.html @@ -13855,7 +13855,339 @@ is separate from validation, and `allowed-pattern` does not affect how the input - +