diff options
| author | adamhrv <adam@ahprojects.com> | 2019-04-03 23:24:12 +0200 |
|---|---|---|
| committer | adamhrv <adam@ahprojects.com> | 2019-04-03 23:24:12 +0200 |
| commit | 7d2043eb24cd171e809d83219e543ce9541ba821 (patch) | |
| tree | c415aae6c682093b18052d622fd201e983e18fd1 /client/table | |
| parent | 2db426422eedc4847618f972b02189f3d49fe03a (diff) | |
| parent | 24e4f4af71f1e146f33688822ac3e4242339faa4 (diff) | |
Merge branch 'master' of github.com:adamhrv/megapixels_dev
Diffstat (limited to 'client/table')
| -rw-r--r-- | client/table/citations.table.js | 2 | ||||
| -rw-r--r-- | client/table/file.table.js | 2 | ||||
| -rw-r--r-- | client/table/tabulator.css | 11 |
3 files changed, 10 insertions, 5 deletions
diff --git a/client/table/citations.table.js b/client/table/citations.table.js index bbc55047..178cc65b 100644 --- a/client/table/citations.table.js +++ b/client/table/citations.table.js @@ -117,7 +117,7 @@ class CitationsTable extends Component { columns={citationsColumns} data={filteredCitations} options={{ - height: 311, + height: Math.max(104, Math.min(37 * formattedCitations.length + 29, 311)), layout: 'fitColumns', placeholder: formattedCitations.length ? '' : 'Nothing matches your query', }} diff --git a/client/table/file.table.js b/client/table/file.table.js index 82c01ac5..db53243a 100644 --- a/client/table/file.table.js +++ b/client/table/file.table.js @@ -71,7 +71,7 @@ class FileTable extends Component { columns={this.state.columns} data={this.state.data} options={{ - height: 311, + height: Math.min(37 * this.state.data.length + 29, 311), layout: 'fitColumns', placeholder: 'No Data Set', }} diff --git a/client/table/tabulator.css b/client/table/tabulator.css index 17dad62a..95768976 100644 --- a/client/table/tabulator.css +++ b/client/table/tabulator.css @@ -8,8 +8,13 @@ .tabulator-row.tabulator-row-even { background-color: #333; } -.desktop .tabulator-row.tabulator-selectable:hover { - background-color: #555; +.desktop .tabulator-row.tabulator-selectable.tabulator-row-even:hover { + cursor: arrow; + background-color: #333; +} +.desktop .tabulator-row.tabulator-selectable.tabulator-row-odd:hover { + cursor: arrow; + background-color: #222; } .tabulator-row .tabulator-cell { border-right: 1px solid #444; @@ -35,7 +40,7 @@ max-width: 400px; margin-bottom: 10px; background-image: url(/assets/img/icon-search.png); - background-position: 390px center; + background-position: 380px center; background-repeat: no-repeat; box-shadow: 0px 2px 4px rgba(0,0,0,0.2); border: 0; |