diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index 547713028a..722038f95b 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -31,14 +31,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" }, - "homepage": "https://github.com/PolymerElements/paper-ripple", + "homepage": "https://github.com/polymerelements/paper-ripple", "_release": "1.0.3", "_resolution": { "type": "version", "tag": "v1.0.3", "commit": "c6e9664ca79c74bbd4219077438c4d163d6be962" }, - "_source": "git://github.com/PolymerElements/paper-ripple.git", + "_source": "git://github.com/polymerelements/paper-ripple.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-ripple" + "_originalSource": "polymerelements/paper-ripple" } \ No newline at end of file diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 639c525d5c..b743cb88ce 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -136,7 +136,6 @@ } .libraryMenuButtonText { - color: #fff !important; text-decoration: none; font-weight: 400 !important; font-size: 15px; diff --git a/dashboard-ui/css/tileitem.css b/dashboard-ui/css/tileitem.css index e0d096e547..0f7e94ad84 100644 --- a/dashboard-ui/css/tileitem.css +++ b/dashboard-ui/css/tileitem.css @@ -8,6 +8,7 @@ -o-transition: all 500ms ease; -ms-transition: all 500ms ease; transition: all 500ms ease; + color: inherit!important; } .tileItem .starRating { @@ -43,7 +44,6 @@ .tileContent { display: inline-block; padding-left: 10px; - color: #fff; text-align: left; vertical-align: top; overflow: hidden; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index b401abb16f..c3af899334 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1935,6 +1935,21 @@ var AppInfo = {}; } } + function loadTheme() { + + var name = getParameterByName('theme'); + if (name) { + require(['themes/' + name + '/theme']); + return; + } + + var date = new Date(); + if (date.getMonth() == 9 && date.getDate() == 31) { + require(['themes/halloween/theme']); + return; + } + } + function onDocumentReady() { // Do these now to prevent a flash of content @@ -1947,6 +1962,8 @@ var AppInfo = {}; } } + loadTheme(); + if ($.browser.safari && $.browser.mobile) { initFastClick(); } diff --git a/dashboard-ui/themes/halloween/bg.jpg b/dashboard-ui/themes/halloween/bg.jpg new file mode 100644 index 0000000000..57a34bf974 Binary files /dev/null and b/dashboard-ui/themes/halloween/bg.jpg differ diff --git a/dashboard-ui/themes/halloween/style.css b/dashboard-ui/themes/halloween/style.css new file mode 100644 index 0000000000..2371fcb473 --- /dev/null +++ b/dashboard-ui/themes/halloween/style.css @@ -0,0 +1,25 @@ +.ui-body-b h1, .ui-body-b h2 { + color: #FF9100; +} + +.viewMenuBar, .barsMenuButton { + color: #FF9100 !important; +} + + +.libraryViewNav .ui-btn-active { + border-bottom-color: #FF9100 !important; + color: #FF9100 !important; +} + +paper-button[raised].more { + background: #FF9100; +} + +.channelTimeslotHeader, .timeslotHeader { + background: #FF9100; +} + +.channelTimeslotHeader { + border-right-color: #FF9100; +} diff --git a/dashboard-ui/themes/halloween/theme.js b/dashboard-ui/themes/halloween/theme.js new file mode 100644 index 0000000000..2f6c158825 --- /dev/null +++ b/dashboard-ui/themes/halloween/theme.js @@ -0,0 +1,20 @@ +(function () { + + Dashboard.importCss('themes/halloween/style.css'); + + + function onPageShow() { + var page = this; + + if (!$.browser.mobile) { + Backdrops.setBackdropUrl(page, 'themes/halloween/bg.jpg'); + } + } + + pageClassOn('pageshow', "libraryPage", onPageShow); + + if ($($.mobile.activePage)[0].classList.contains('libraryPage')) { + onPageShow.call($($.mobile.activePage)[0]); + } + +})(); \ No newline at end of file