secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Inherit standard input field styles; Version event

Browse Source
This commit is contained in:
James Barnsley
2017-04-20 16:50:35 +12:00
parent de576b2d46
commit 6e16e058ef
4 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/js/components/Modal/EditRadioModal.js
View File

@ -110,25 +110,37 @@ export default class EditRadioModal extends React.Component{
}
}
return (
<div>
<div className="list">
{
seeds.map((seed,index) => {
return (
<div className="list-item" key={seed.uri}>
{seed.unresolved ? <span className="grey-text">{seed.uri}</span> : <span>{seed.name}</span> }
<span className="grey-text">&nbsp;({seed.type})</span>
<button className="discrete remove-uri" onClick={e => this.removeSeed(seed.uri)}>
<FontAwesome name="close" />&nbsp;Remove
</button>
</div>
)
})
}
if (seeds.length > 0){
return (
<div>
<div className="list">
{
seeds.map((seed,index) => {
return (
<div className="list-item" key={seed.uri}>
{seed.unresolved ? <span className="grey-text">{seed.uri}</span> : <span>{seed.name}</span> }
<span className="grey-text">&nbsp;({seed.type})</span>
<button className="discrete remove-uri" onClick={e => this.removeSeed(seed.uri)}>
<FontAwesome name="close" />&nbsp;Remove
</button>
</div>
)
})
}
</div>
</div>
</div>
)
)
} else {
return (
<div>
<div className="list">
<div className="list-item no-click">
<span className="grey-text">No seeds</span>
</div>
</div>
</div>
)
}
}
render(){
@ -139,7 +151,7 @@ export default class EditRadioModal extends React.Component{
<form>
{this.renderSeeds()}
<div className="field no-top-margin">
<div className="field">
<input
type="text"
placeholder="Comma-separated URIs"

11
src/js/services/ui/middleware.js
View File

@ -21,7 +21,7 @@ const UIMiddleware = (function(){
break
case 'PUSHER_CONNECTED':
ReactGA.event({ category: 'Pusher', action: 'Connected', label: action.connection_id+'/'+action.username })
ReactGA.event({ category: 'Pusher', action: 'Connected', label: action.username })
next(action)
break
@ -350,9 +350,12 @@ const UIMiddleware = (function(){
next(action)
break
case 'VERSION':
if( action.version.upgrade_available )
store.dispatch( uiActions.createNotification( 'Version '+action.version.latest+' is available. See settings to upgrade.' ) )
case 'PUSHER_VERSION':
ReactGA.event({ category: 'Pusher', action: 'Version', label: action.version.current })
if (action.version.upgrade_available){
store.dispatch( uiActions.createNotification( 'Version '+action.version.latest+' is available. See settings to upgrade.' ) )
}
next( action )
break

2
src/scss/components/_lists.scss
View File

@ -22,7 +22,7 @@
background: $yellow !important;
}
:root .notouch &:not(.header):hover {
:root .notouch &:not(.header):not(.no-click):hover {
background: rgba(150,150,150,0.1);
cursor: pointer;
}

10
src/scss/components/_modal.scss
View File

@ -88,11 +88,6 @@
top: 18px;
left: 10px;
}
&:hover {
cursor: pointer;
background: rgba(255,255,255,0.1);
}
}
&.playlists {
@ -136,11 +131,10 @@
form {
.field {
position: relative;
margin-top: 10px;
margin-top: 50px;
input[type="text"]{
font-size: 14px;
padding: 16px 18px;
padding-right: 80px;
}
}
}