Skip to content

Commit

Permalink
Merge pull request #52 from gnehs/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
gnehs authored Sep 6, 2018
2 parents 78b28c3 + 9f759a4 commit c71a3a7
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pokaplayer",
"version": "0.10.2",
"version": "0.10.3",
"description": "",
"main": "index.js",
"scripts": {
Expand Down
26 changes: 26 additions & 0 deletions public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ header.mdui-appbar.mdui-appbar-fixed {
}
}

@media screen and (max-width:1023px) {
#drawer .mdui-list-item {
border-radius: 0;
}
}


/* header-wrapper */

Expand Down Expand Up @@ -207,6 +213,26 @@ header.mdui-appbar.mdui-appbar-fixed {
background-size: cover;
}

.album:nth-child(5n+1) {
background-color: rgb(210, 105, 30);
}

.album:nth-child(5n+2) {
background-color: rgb(30, 210, 30);
}

.album:nth-child(5n+3) {
background-color: rgb(29, 179, 233);
}

.album:nth-child(5n+4) {
background-color: rgb(255, 179, 179);
}

.album:nth-child(5n+5) {
background-color: rgb(62, 47, 146);
}

.album .mdui-card-media {
position: unset;
}
Expand Down
8 changes: 5 additions & 3 deletions public/js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@ router
done()
},
after: params => {
$('#drawer a').removeClass('mdui-list-item-active')
$(`#drawer a[href="${$('#content').attr('data-page')}"]`).addClass('mdui-list-item-active')
$('#drawer a')
.removeClass('mdui-color-theme mdui-list-item-active')
$(`#drawer a[href="${$('#content').attr('data-page')}"]`)
.addClass('mdui-color-theme mdui-list-item-active')
}
})

Expand All @@ -51,7 +53,7 @@ $(() => {
tryRelogin()

$(`#drawer a[href="${$('#content').attr('data-page')}"]`)
.addClass('mdui-list-item-active')
.addClass('mdui-list-item-active mdui-color-theme')
$(`#drawer a`)
.click(function() {
if ($(window).width() < 1024) {
Expand Down
9 changes: 6 additions & 3 deletions public/js/setting.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@ $(async() => {
navigator.serviceWorker
.register('/sw.js', { scope: '/' })
.then(reg => {
if (version != window.localStorage["PokaPlayerVersion"]) {
reg.update()
}
if (version != window.localStorage["PokaPlayerVersion"]) reg.update()
})
.catch(err => console.log('Error!', err));
}
// 更新版本號
if (version != window.localStorage["PokaPlayerVersion"]) {
if ($("#content").attr("data-page") == "settings" || $("#content").attr("data-page") == "home")
$("#header-wrapper .title .subtitle").text(`PokaPlayer ${version}`)
}
window.localStorage["PokaPlayerVersion"] = version;
});
//- 設定頁面用的範本
Expand Down

0 comments on commit c71a3a7

Please sign in to comment.