Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change GenomeBrowser input controls to nowrap inline blocks #749

Merged
merged 2 commits into from
Jan 3, 2017
Merged

Change GenomeBrowser input controls to nowrap inline blocks #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f02241
Change GenomeBrowser input controls to nowrap inline blocks
Dec 12, 2016
4715de9
Fix popup body overlaying border
Jan 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions webapp/src/js/components/containers/GenomeBrowserWithActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@ let GenomeBrowserWithActions = React.createClass({
title={sidebar ? 'Expand' : 'Sidebar'}
/>
</div>
<GenomeBrowser setProps={setProps} sideWidth={150} {...subProps} >
{children}
</GenomeBrowser>
<div className="grow">
<GenomeBrowser setProps={setProps} sideWidth={150} {...subProps} >
{children}
</GenomeBrowser>
</div>
</div>
</Sidebar>
);
Expand Down
84 changes: 45 additions & 39 deletions webapp/src/js/components/panoptes/genome/Controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,52 +93,58 @@ let Controls = React.createClass({
let max = this.config.chromosomes[chromosome] || FALLBACK_MAXIMUM;
return (
<span className="controls">
<span> Chromosome: </span>
<span>
<select ref="chromosome" value={chromosome} onChange={this.handleChromChange}>
{_map(this.config.chromosomes, (length, name) =>
<option key={name}
value={name}>
{name}
</option>
)}
</select>
<span className="block">
<span> Chromosome: </span>
<span>
<select ref="chromosome" value={chromosome} onChange={this.handleChromChange}>
{_map(this.config.chromosomes, (length, name) =>
<option key={name}
value={name}>
{name}
</option>
)}
</select>
</span>
</span>
<span> Region: </span>
<span>
<input className={classnames({wide: true, invalid: !regionValid})}
ref="region"
type="text"
spellCheck="false"
value={regionText}
min={minWidth}
max={max}
onChange={this.handleRegionChange}/>
<span className="block">
<span> Region: </span>
<span>
<input className={classnames({wide: true, invalid: !regionValid})}
ref="region"
type="text"
spellCheck="false"
value={regionText}
min={minWidth}
max={max}
onChange={this.handleRegionChange}/>
</span>
</span>
<span> Midpoint: </span>
<span>
<input ref="midpoint"
type="number"
min={0}
max={max}
value={parseInt(midpoint)}
onChange={this.handleRangeChange}/>
<span className="block">
<span> Midpoint: </span>
<span>
<input ref="midpoint"
type="number"
min={0}
max={max}
value={parseInt(midpoint)}
onChange={this.handleRangeChange}/>
</span>
</span>
<span className="block">
<span> Width: </span>
<span>
<input ref="width"
type="number"
value={parseInt(width)}
min={minWidth}
max={max}
onChange={this.handleRangeChange}/>
</span>
</span>
<span> Width: </span>
<span>
<input ref="width"
type="number"
value={parseInt(width)}
min={minWidth}
max={max}
onChange={this.handleRangeChange}/>
</span>


</span>
);
}
});

export default Controls;

2 changes: 1 addition & 1 deletion webapp/src/js/components/ui/Popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ let Popup = React.createClass({
<Icon className="pointer close" name="folder-o" onClick={this.handleMaximise}/>
<Icon className="pointer close" name="close" onClick={this.handleClose}/>
</div>
<div className="popup-body" style={{width, height: height - TOPBAR_HEIGHT}}>
<div className="popup-body" style={{width: width - 2, height: height - TOPBAR_HEIGHT - 2}}>
{React.cloneElement(children, {ref: 'child'})}
</div>
<div className="popup-drag"></div>
Expand Down
8 changes: 6 additions & 2 deletions webapp/src/styles/genomebrowser.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@import "./variables";

.genome-browser {
height: calc(100% - 41px);
height: 100%;
width: 100%;
.control-bar {
//height: 40px;
line-height: 40px;
line-height: 30px;
.loading-canvas {
//opacity: 0;
transition: opacity .5s ease-in-out;
Expand All @@ -26,6 +26,10 @@
width: 200px
}
}
span.block {
display: inline-block;
white-space: nowrap;
}
}
.controls > * {
padding-left: 10px;
Expand Down