Merge branch 'develop'

This commit is contained in:
James Barnsley
2018-04-23 19:17:30 +12:00
5 changed files with 7 additions and 5 deletions

View File

@ -1,2 +1,3 @@
include mopidy_iris/ext.conf
include mopidy_iris/system.sh
recursive-include mopidy_iris/static *

View File

@ -70821,8 +70821,9 @@ var Settings = function (_React$Component) {
'Upgrade available'
) : _react2.default.createElement(
'span',
{ className: 'flag grey' },
'Up-to-date'
{ className: 'flag dark' },
_react2.default.createElement(_reactFontawesome2.default, { name: 'check', className: 'green-text' }),
'\xA0 Up-to-date'
)
)
)

File diff suppressed because one or more lines are too long

View File

@ -73,7 +73,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1524449368";
var build = "1524453175";
var version = "3.17.3";
// Construct the script tag

View File

@ -271,7 +271,7 @@ class Settings extends React.Component {
<div className="name">Version</div>
<div className="input">
<span className="text">
{this.props.pusher.version.current} installed {this.props.pusher.version.upgrade_available ? <span className="flag blue">Upgrade available</span> : <span className="flag grey">Up-to-date</span>}
{this.props.pusher.version.current} installed {this.props.pusher.version.upgrade_available ? <span className="flag blue">Upgrade available</span> : <span className="flag dark"><FontAwesome name="check" className="green-text" />&nbsp; Up-to-date</span>}
</span>
</div>
</div>