Skip to content

Commit

Permalink
Tiny copy and style tweaks for clean up.
Browse files Browse the repository at this point in the history
  • Loading branch information
jaclynperrone committed Jun 19, 2015
1 parent f923682 commit 0024d41
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var ExamineInformation = React.createClass({
return (
<div className="examine-information">
<dl className='dl-horizontal'>
<dt>Caller</dt> <dd>{run.caller_name}</dd>
<dt>Caller Name</dt> <dd>{run.caller_name}</dd>
<dt>VCF URI</dt> <dd>{run.uri}</dd>
<dt>Submitted</dt> <dd>{run.created_at}</dd>
</dl>
Expand Down
4 changes: 1 addition & 3 deletions cycledash/static/js/examine/components/PileupViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,10 @@ var PileupViewer = React.createClass({

return (
<div className="variant-inspector" ref="inspector" style={style}>
{vcfTable}
<a href='#' className="close-button" onClick={this.handleClose}></a>
<a href='#' className="left-button" onClick={this.handleLeft}></a>
<a href='#' className="right-button" onClick={this.handleRight}></a>

{vcfTable}

<div ref="pileupElement" id="pileup-container" />
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion cycledash/static/js/runs/components/RunsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ var RunsTable = React.createClass({
<thead>
<tr>
<th className='caller-name'>Caller Name</th>
<th className='date'>Submitted On</th>
<th className='date'>Submitted</th>
<th className='num-variants'>Variants</th>
<th className='bam-info'>Linked BAMs</th>
<th className='num-comments'></th>
Expand Down
39 changes: 29 additions & 10 deletions cycledash/static/scss/examine.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ a, a:hover {
border-radius: $radius;
position: absolute;
top: 110%;
left: 0;
right: 0;
background: $color-white;
background-color: $color-bg-hover;
border: 1px solid $color-border-light;
Expand All @@ -94,7 +94,7 @@ a, a:hover {
}
.vcf-table .tooltip:after, .tooltip:before {
bottom: 100%;
left: 10%;
right: 10%;
border: solid transparent;
content: " ";
height: 0;
Expand All @@ -106,13 +106,13 @@ a, a:hover {
border-color: rgba(231, 246, 252, 0);
border-bottom-color: $color-bg-hover;
border-width: 10px;
margin-left: -10px;
margin-right: -10px;
}
.vcf-table .tooltip:before {
border-color: rgba(51, 51, 51, 0);
border-bottom-color: $color-border-light;
border-width: 11px;
margin-left: -11px;
margin-right: -11px;
}
.vcf-table .variant-info {
border-top: 1px solid $color-border-light;
Expand Down Expand Up @@ -327,7 +327,7 @@ a, a:hover {
right: 0;
top: 0;
bottom: 0;
background-color: $color-white;
background-color: $color-bg-expanded;
}
.variant-inspector .close-button, .variant-inspector .right-button {
float: right;
Expand All @@ -348,6 +348,27 @@ a, a:hover {
margin: 0 5%;
padding: 10px;
width: 90%;
background-color: $color-white;
border-radius: $radius;
}
#pileup-container .controls {
select, input {
@extend .form-control;
display: inline-block;
width: auto;
margin-left: 0.5em;
}
button {
@extend .btn, .btn-default;
&:first-of-type {
@extend .btn-primary;
margin-left: 0.5em;
margin-right: 1em;
}
&:last-of-type {
margin-left: 0.25em;
}
}
}

/* All of the tracks are fixed-height except for the pileup(s), which split the
Expand All @@ -359,7 +380,7 @@ a, a:hover {
}

#pileup-container .controls {
flex: 0 0 30px; /* fixed height */
flex: 0 0 35px; /* fixed height */
}
#pileup-container .reference {
flex: 0 0 50px; /* fixed height */
Expand All @@ -372,19 +393,17 @@ a, a:hover {
height: auto; /* overrides defaults from pileup.css */
overflow-y: auto; /* extra content scrolls */
}

.pileup {
border-top: 1px solid #000;
border-top: 1px solid $color-gray-medium;
}


/*------[ VCFValidation ]------*/
.vcf-validations select {
@extend .form-control;
}
.examine-header {
@extend .container;
margin-bottom: 2em;
margin-bottom: 1em;
margin-top: 20px;
}

Expand Down
9 changes: 9 additions & 0 deletions cycledash/static/scss/runs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,15 @@ td.comments {
.runs-table .examine-col {
width: 10%;
}
.bams-table .bam-name {
width: 30%
}
.bams-table .resection-date {
width: 21%;
}
.bams-table .tissues {
width: 50%;
}
.linked-bam {
display: inline-block;
}
Expand Down
2 changes: 1 addition & 1 deletion cycledash/templates/macros/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<a class="header-logo" href="/">Home</a>
<ul>
<li class="{{ 'active' if active == 'runs' else '' }}">
<a href="/">Runs</a>
<a href="/">Projects</a>
{% if active == 'examine' %} &raquo;
<span class="{{ 'active' if active == 'examine' else '' }}">Examine</span>
{% elif active == 'comments' %} &raquo;
Expand Down
2 changes: 1 addition & 1 deletion cycledash/templates/tasks.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h4>{{ task.type }}: {{ task.state }}</h4>
</section>

<section>
<button id='restart' class='btn btn-default'>
<button id='restart' class='btn btn-primary'>
Restart these tasks
</button>
</section>
Expand Down

0 comments on commit 0024d41

Please sign in to comment.