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

Merge remote-tracking branch 'upstream/develop' into fix/79_explicit_2

Browse Source 
Conflicts:
	README.rst
This commit is contained in:
jcass 2016-01-31 06:46:25 +02:00
commit 19363e1476
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -103,6 +103,8 @@ v2.1.0 (UNRELEASED)
- Fix vertical alignment of playback control buttons in footer. - Fix vertical alignment of playback control buttons in footer.
- Increase width of header so that more text can be rendered in the title bar. - Increase width of header so that more text can be rendered in the title bar.
(Fixes: `#144 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/144>`_). (Fixes: `#144 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/144>`_).
- Re-align the menu and search buttons in the title bar.
(Fixes: `#148 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/148>`_).
- Use explicit Mopidy.js calling convention. (Fixes: `#79 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/79>`_). - Use explicit Mopidy.js calling convention. (Fixes: `#79 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/79>`_).

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

@ -129,14 +129,11 @@
color:white; color:white;
} }
#headermenubtn{ #headermenubtn {
width: 50px; padding-top: 2px;
} }
#headersearchbtn{
text-align: right; #headersearchbtn span {
}
#headersearchbtn .ui-btn-inner{
padding: 6px;
font-size: 15px; font-size: 15px;
} }

4
mopidy_musicbox_webclient/static/index.html
View File

@ -224,9 +224,9 @@
<div data-role="header" data-tap-toggle="false" id="header" data-position="fixed" class="header-breakpoint headerbtn"> <div data-role="header" data-tap-toggle="false" id="header" data-position="fixed" class="header-breakpoint headerbtn">
<a href="#panel" style="padding-top: 2px;" id="headermenubtn"><i class="fa fa-align-justify"></i></a> <a id="headermenubtn" href="#panel"><i class="fa fa-align-justify"></i></a>
<h1 id="contentHeadline">Musicbox</h1> <h1 id="contentHeadline">Musicbox</h1>
<a id="headersearchbtn" href="#" class="ui-btn-icon-right headerbtn" onclick="switchContent('search' ); return false;" title="Search"><i class="fa fa-search"></i></a> <a id="headersearchbtn" href="#" onclick="switchContent('search' ); return false;" title="Search"><i class="fa fa-search"></i></a>
</div> </div>
<!-- /header --> <!-- /header -->