diff options
| author | gebele <gebele@in-silico.ch> | 2014-02-20 16:27:03 +0100 |
|---|---|---|
| committer | gebele <gebele@in-silico.ch> | 2014-02-20 16:27:03 +0100 |
| commit | e95e31449ef13b2e0f11ae7d209a12417ddcdc80 (patch) | |
| tree | 74acfa18aad9e3dc1db40b44519f798a29dca2e6 /views | |
| parent | 55942467844eb07128749cf0655e79e1b9f80a88 (diff) | |
| parent | ecae07354c9a6b7f13fdf70ef832ccafc9c64d05 (diff) | |
Merge branch 'fileoutput' into feature/hide_elements
Conflicts:
application.rb
views/layout.haml
views/neighbors.haml
views/style.scss
Diffstat (limited to 'views')
| -rw-r--r-- | views/layout.haml | 4 | ||||
| -rw-r--r-- | views/style.scss | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/views/layout.haml b/views/layout.haml index 280301b..b6b4c0e 100644 --- a/views/layout.haml +++ b/views/layout.haml @@ -13,7 +13,8 @@ url: uri, //timeout: 120000; success: function(data){ - data = "<h4>"+title+"</h4>"+"<button onclick='hide(\"" + title + "\",\"" + element + "\",\"" + uri + "\");'>Hide</button>" + data; + var slash = new RegExp("/","g"); + data = "<h4>"+title+"</h4>"+"<button onclick='hide(\"" + title + "\",\"" + element + "\",\"" + uri + "\");'>Hide</button> <a href=\"" + uri + "/" + uri.replace("/cid/", "").replace(slash,'-') + ".csv\"> (csv)</a>" + data; $(element).html(data); }, error: function(data,textStatus,message){ @@ -117,4 +118,3 @@ return false; }); }); - diff --git a/views/style.scss b/views/style.scss index 1ec0990..25833e7 100644 --- a/views/style.scss +++ b/views/style.scss @@ -39,9 +39,10 @@ h4 { /* tables */ th { - color: #333; + color: #000; text-align: left; - font-size: 1em; + font-size: 1.1em; + padding: 8px 0; } td { vertical-align: top; |