Merge branch 'develop' of github.com:jaedb/Iris into develop

This commit is contained in:
James Barnsley
2018-06-01 20:44:50 +12:00
6 changed files with 25327 additions and 23403 deletions

View File

@ -4545,7 +4545,9 @@ input[type="submit"] {
padding-right: 30px; }
.snapcast .group .clients .client > .name .group-dropdown-field {
float: right;
margin-bottom: -4rem; }
margin-bottom: -3.2rem; }
.snapcast .group .clients .client > .name .group-dropdown-field .icon {
padding-right: 0; }
.snapcast .group .clients .client > .volume {
width: 28%;
padding-left: 2%; }

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -77,7 +77,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1527756889";
var build = "1527816197";
var version = "3.19.0";
// Construct the script tag

View File

@ -81,7 +81,7 @@ class Snapcast extends React.Component{
<div className="col name">
<DropdownField
className="group-dropdown-field"
icon="cog"
icon="settings"
name="Group"
no_label
no_status_icon

View File

@ -77,7 +77,11 @@
.group-dropdown-field {
float: right;
margin-bottom: -4rem;
margin-bottom: -3.2rem;
.icon {
padding-right: 0;
}
}
}