Links in broadcasts now buttons; Fixing regression with sortable tracks and track_context property

This commit is contained in:
James Barnsley
2019-02-06 14:07:17 +13:00
parent fea17c8cb9
commit 0dd4140fee
10 changed files with 53 additions and 22 deletions

View File

@ -73,7 +73,7 @@ export default class Notifications extends React.Component{
<p>Do you want to import this?</p>
</div>
<div className="notification__actions">
<a className="notification__actions__item button button--secondary" onClick={e => this.importConfiguration(notification.key, notification.configuration)}>Import</a>
<a className="notification__actions__item button button--default" onClick={e => this.importConfiguration(notification.key, notification.configuration)}>Import</a>
</div>
</div>
)
@ -114,7 +114,7 @@ export default class Notifications extends React.Component{
</div>
</div>
{process.message}
<Icon name="close" className="close-button" onClick={e => {this.props.uiActions.cancelProcess(process.key)}} />
<Icon name="close" className="notification__close-button" onClick={e => {this.props.uiActions.cancelProcess(process.key)}} />
</div>
)

View File

@ -409,7 +409,7 @@ class TrackList extends React.Component{
mini_zones={this.props.slim_mode || helpers.isTouchDevice()}
track={track}
track_context={this.props.track_context}
can_sort={this.props.context == 'queue' || this.props.context == 'editable-playlist'}
can_sort={this.props.track_context == 'queue' || this.props.track_context == 'editable-playlist'}
selected={this.props.selected_tracks.includes(track_key)}
play_state={this.props.play_state}
dragger={this.props.dragger}

View File

@ -259,6 +259,20 @@ select {
}
}
&--darken {
background: rgba(0,0,0,0.8);
color: colour(white);
&:active {
background: rgba(0,0,0,0);
}
}
&--lighten {
background: rgba(255,255,255,0.8);
color: colour(darkest_grey);
}
&--secondary {
background: colour(blue);
color: colour(white);