andpp/mopidy-musicbox-webclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into fix/230_refresh

Browse Source 
# Conflicts:
#	mopidy_musicbox_webclient/static/mb.appcache
This commit is contained in:
jcass 2017-02-26 20:06:34 +02:00
commit dcc5b62f76
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mopidy_musicbox_webclient/static/css/webclient.css
View File

@ -640,6 +640,7 @@ a {
.ui-responsive-panel.ui-page-panel .ui-panel-content-wrap-open.ui-panel-content-wrap-display-push, .ui-responsive-panel.ui-page-panel .ui-panel-content-wrap-open.ui-panel-content-wrap-display-push,
.ui-responsive-panel.ui-page-panel .ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal { .ui-responsive-panel.ui-page-panel .ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal {
margin-right: 17em; margin-right: 17em;
width: auto;
} }
.ui-responsive-panel.ui-page-panel .ui-panel-content-fixed-toolbar-open.ui-panel-content-wrap-display-push.ui-panel-content-fixed-toolbar-position-right, .ui-responsive-panel.ui-page-panel .ui-panel-content-fixed-toolbar-open.ui-panel-content-wrap-display-push.ui-panel-content-fixed-toolbar-position-right,
@ -648,14 +649,14 @@ a {
.ui-responsive-panel.ui-page-panel .ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal.ui-panel-content-wrap-position-right { .ui-responsive-panel.ui-page-panel .ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal.ui-panel-content-wrap-position-right {
margin: 0 0 0 17em; margin: 0 0 0 17em;
} }
.ui-responsive-panel .ui-panel-dismiss-display-reveal {
display: none;
}
} }
/*tablets and desktop*/ /*tablets and desktop*/
@media (min-width: 35em) { @media (min-width: 35em) {
.ui-responsive-panel .ui-panel-dismiss-display-reveal {
display: none;
}
.popupDialog { .popupDialog {
min-width: 320px; min-width: 320px;
} }

6
mopidy_musicbox_webclient/static/js/gui.js
View File

@ -20,7 +20,7 @@ function resetSong () {
} }
function resizeMb () { function resizeMb () {
if ($(window).width() < 560) { if ($(window).width() < 880) {
$('#panel').panel('close') $('#panel').panel('close')
} else { } else {
$('#panel').panel('open') $('#panel').panel('open')
@ -373,6 +373,10 @@ function locationHashChanged () {
setHeadline(divid) setHeadline(divid)
if ($(window).width() < 880) {
$('#panel').panel('close')
}
$('.mainNav a').removeClass($.mobile.activeBtnClass) $('.mainNav a').removeClass($.mobile.activeBtnClass)
// i don't know why some li elements have those classes, but they do, so we need to remove them // i don't know why some li elements have those classes, but they do, so we need to remove them
$('.mainNav li').removeClass($.mobile.activeBtnClass) $('.mainNav li').removeClass($.mobile.activeBtnClass)

2
mopidy_musicbox_webclient/static/mb.appcache
View File

@ -1,6 +1,6 @@
CACHE MANIFEST CACHE MANIFEST
# 2017-02-18:v2 # 2017-02-24:v1
NETWORK: NETWORK:
* *