Merge branch 'master' of asdf.us:megapixels_dev

5 files changed, 36 insertions, 25 deletions

diff --git a/client/chart/chart.css b/client/chart/chart.css
index f9c33247..2df5a97a 100644
--- a/client/chart/chart.css
+++ b/client/chart/chart.css
@@ -1,22 +1,24 @@
 .chart text {
-  fill: white;
+  fill: black;
 }
 .chart line {
-  stroke: white;
+  stroke: black;
 }
 .chart path {
-  stroke: white;
+  stroke: black;
 }
 .c3 path,
 .c3 line {
-  stroke: white;
+  stroke: black;
 }
 
 .c3-tooltip,
 .c3-tooltip td {
   background: rgba(0,0,0,0.8);
+  color: #fff;
 }
 .c3-tooltip th {
   font-family: 'Roboto', sans-serif;
-  background: black;
-}
+  background: rgba(255,255,255,0.0);
+  /*background: black;*/
+}
\ No newline at end of file
diff --git a/client/modalImage/modal.css b/client/modalImage/modal.css
index d628cc48..c8ef9b60 100644
--- a/client/modalImage/modal.css
+++ b/client/modalImage/modal.css
@@ -31,7 +31,8 @@
 .modal .caption {
   display: block;
   text-align: center;
-  background: black;
+  /*background: black;*/
+  color: #FFF;
   padding: 10px;
 }
 .modal .prev span,
diff --git a/client/table/citations.table.js b/client/table/citations.table.js
index c1c71906..45da5676 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: Math.max(104, Math.min(37 * formattedCitations.length + 29, 311)),
+            // height: Math.max(104, Math.min(30 * formattedCitations.length + 30, 1000)),
             layout: 'fitColumns',
             placeholder: formattedCitations.length ? '' : 'Nothing matches your query',
           }}
diff --git a/client/table/index.js b/client/table/index.js
index c741f33e..492a6ab3 100644
--- a/client/table/index.js
+++ b/client/table/index.js
@@ -1,5 +1,6 @@
 import 'react-tabulator/lib/styles.css'
-import 'react-tabulator/lib/css/tabulator_midnight.css'
+//import 'react-tabulator/lib/css/tabulator_midnight.css'
+import 'react-tabulator/lib/css/semantic-ui/tabulator_semantic-ui.css'
 import './tabulator.css'
 
 import CitationsTable from './citations.table'
diff --git a/client/table/tabulator.css b/client/table/tabulator.css
index 0ea81974..a1504dd6 100644
--- a/client/table/tabulator.css
+++ b/client/table/tabulator.css
@@ -1,22 +1,27 @@
 .tabulator {
-  border-left: 1px solid #333;
-  border-bottom: 1px solid #333;
+  /*border-left: 1px solid #333;
+  border-bottom: 1px solid #333;*/
+  font-size: 12px;
 }
 .tabulator-row.tabulator-row-odd {
-  background-color: #222;
+  background-color: #ddd;
 }
 .tabulator-row.tabulator-row-even {
-  background-color: #333;
+  background-color: #ebebeb;
+}
+.desktop .tabulator-row.tabulator-selectable.tabulator-row-odd:hover {
+  cursor: pointer ;
+  background-color: #ebebeb;
 }
 .desktop .tabulator-row.tabulator-selectable.tabulator-row-even:hover {
-  cursor: arrow;
-  background-color: #333;
+  cursor: pointer;
+  background-color: #ddd;
 }
-.desktop .tabulator-row.tabulator-selectable.tabulator-row-odd:hover {
-  cursor: arrow;
-  background-color: #222;
+.desktop .content .tabulator-row .tabulator-cell a{
+  border-bottom: none;
+  text-decoration: underline;
 }
-.tabulator-row .tabulator-cell {
+/*.tabulator-row .tabulator-cell {
   border-right: 1px solid #444;
   padding: 8px;
 }
@@ -32,7 +37,7 @@
 .multi-value-formatter-content span {
   border: 0;
   padding: 0 5px 0 0;
-}
+}*/
 
 .citationBrowser {
 }
@@ -42,7 +47,7 @@
   background-image: url(/assets/img/icon-search.png);
   background-position: 378px center;
   background-repeat: no-repeat;
-  box-shadow: 0px 2px 4px rgba(0,0,0,0.2);
+  box-shadow: 1px 2px 4px rgba(0,0,0,0.6);
   border: 0;
 }
 
@@ -55,13 +60,15 @@
 }
 .download {
   display: block;
-  font-size: 13px;
-  color: #ddd;
+  font-size: 11px;
+  color: #333;
   cursor: pointer;
-  background: #333;
-  padding: 5px 8px 5px 8px;
+  background: #ddd;
+  padding: 10px 14px;
   border-radius: 5px;
   transition: all 0.2s;
+  font-weight: 500;
+  text-transform: uppercase;
   border: 0 !important;
 }
 .content a.download {