thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into clostridium

Browse source 
* master:
  Drop isEditing
  Fix table widths
This commit is contained in:
Matthew Dillon 2015-09-10 16:26:28 -07:00
commit f4939a962e
6 changed files with 30 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/pods/protected/characteristics/show/template.hbs
View file

@ -1,6 +1,6 @@
<div class="grid-1"> <div class="grid-1">
<div class="span-1"> <div class="span-1">
<fieldset class="flakes-information-box {{if isEditing 'is-editing'}}"> <fieldset class="flakes-information-box">
<legend> <legend>
{{model.characteristicName}} {{model.characteristicName}}
</legend> </legend>

10
app/pods/protected/compare/results/template.hbs
View file

@ -1,5 +1,4 @@
<div class="overflow-div"> <table class="flakes-table">
<table class="flakes-table">
<thead> <thead>
<tr> <tr>
<th>Characteristic</th> <th>Characteristic</th>
@ -21,7 +20,6 @@
</tr> </tr>
{{/each}} {{/each}}
</tbody> </tbody>
</table> </table>
<hr> <hr>
<a href="{{csvLink}}" download>Download as CSV</a> <a href="{{csvLink}}" download>Download as CSV</a>
</div>

2
app/pods/protected/species/show/template.hbs
View file

@ -1,6 +1,6 @@
<div class="grid-1"> <div class="grid-1">
<div class="span-1"> <div class="span-1">
<fieldset class="flakes-information-box {{if isEditing 'is-editing'}}"> <fieldset class="flakes-information-box">
<legend> <legend>
Species <em>{{model.speciesName}}</em> Species <em>{{model.speciesName}}</em>
</legend> </legend>

2
app/pods/protected/strains/show/template.hbs
View file

@ -1,5 +1,5 @@
<div class="span-1"> <div class="span-1">
<fieldset class="flakes-information-box {{if isEditing 'is-editing'}}"> <fieldset class="flakes-information-box">
<legend> <legend>
Strain {{model.strainNameMU}} Strain {{model.strainNameMU}}
</legend> </legend>

2
app/pods/protected/users/show/template.hbs
View file

@ -1,5 +1,5 @@
<div class="span-1"> <div class="span-1">
<fieldset class="flakes-information-box {{if isEditing 'is-editing'}}"> <fieldset class="flakes-information-box">
<legend> <legend>
{{model.name}} {{model.name}}
</legend> </legend>

12
app/styles/app.css
View file

@ -7,10 +7,6 @@
overflow: auto; overflow: auto;
} }
.measurements-container {
padding: 2em 0em 0em 0em;
}
.select2-container { .select2-container {
width: 100%; width: 100%;
} }
@ -19,14 +15,14 @@
cursor: pointer; cursor: pointer;
} }
.is-editing {
background-color: #FFFCE2;
}
.type-strain { .type-strain {
color: #5CA934; color: #5CA934;
} }
table.flakes-table td {
white-space: normal;
}
/* BEGIN https://github.com/tobiasahlin/SpinKit */ /* BEGIN https://github.com/tobiasahlin/SpinKit */
.spinner { .spinner {
width: 40px; width: 40px;