Ensure zoom icon is nice

This commit is contained in:
Lukas Martinelli 2017-01-09 22:09:15 +01:00
parent 5d70de6202
commit c3417241f1
4 changed files with 20 additions and 5 deletions

View file

@ -19,8 +19,9 @@ export default class DocLabel extends React.Component {
return <label
style={{
...input.label,
...this.props.style,
position: 'relative',
verticalAlign: 'top',
...this.props.style,
}}
>
<span

View file

@ -123,14 +123,15 @@ export default class ZoomSpecField extends React.Component {
}}>
{label}
<Button
style={{backgroundColor: null}}
style={{backgroundColor: null, verticalAlign: 'top'}}
onClick={this.deleteStop.bind(this, idx)}
>
<DeleteIcon />
</Button>
<NumberInput
style={{
width: '7.5%'
width: '7.5%',
verticalAlign: 'top',
}}
value={zoomLevel}
onChange={changedStop => this.changeStop(idx, changedStop, value)}
@ -169,7 +170,11 @@ export default class ZoomSpecField extends React.Component {
/>
{this.props.fieldSpec['zoom-function'] &&
<Button
style={{backgroundColor: null}}
style={{
verticalAlign: 'top',
backgroundColor: null,
display: 'inline-block',
}}
onClick={this.makeZoomFunction.bind(this)}
>
<FunctionIcon />

View file

@ -30,6 +30,7 @@ class ArrayInput extends React.Component {
const commonStyle = {
width: '48%',
marginRight: '2%',
marginBottom: '2%'
}
const inputs = this.values.map((v, i) => {
if(this.props.type === 'number') {

View file

@ -1,6 +1,7 @@
import React from 'react'
import AutocompleteInput from './AutocompleteInput'
import input from '../../config/input.js'
import { margins } from '../../config/scales.js'
//TODO: Query available font stack dynamically
import fontStacks from '../../config/fontstacks.json'
@ -29,10 +30,17 @@ class FontInput extends React.Component {
value={value}
options={fontStacks.map(f => [f, f])}
onChange={this.changeFont.bind(this, i)}
wrapperStyle={{
display: 'block',
marginBottom: i == this.values.length - 1 ? 0 : margins[2],
}}
/>
})
return <div style={{display: 'inline-block'}}>
return <div style={{
display: 'inline-block',
...this.props.style
}}>
{inputs}
</div>
}