Skip to content

Commit

Permalink
Merge pull request #142 from mistercrunch/npm
Browse files Browse the repository at this point in the history
A few cosmetic fixes (nvd3 tooltips, buttons, tables)
  • Loading branch information
mistercrunch committed Feb 24, 2016
2 parents dbb9f66 + df8ea52 commit 71073d8
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
6 changes: 3 additions & 3 deletions panoramix/assets/html/explore.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>
{% endmacro %}

<div class="datasource">
<div class="datasource container-fluid">
<form id="query" method="GET" style="display: none;">
<div class="header">
<span class="btn btn-default notbtn">
Expand All @@ -45,10 +45,10 @@
{% endif %}
<div class="btn-group results pull-right" role="group">
<a role="button" tabindex="0" class="btn btn-default" id="shortner" title="Short URL" data-toggle="popover" data-trigger="focus">
<i class="fa fa-link"></i>
<i class="fa fa-link"></i>&nbsp;
</a>
<span class="btn btn-default" id="standalone" title="Standalone version, use to embed anywhere" data-toggle="tooltip">
<i class="fa fa-code"></i>
<i class="fa fa-code"></i>&nbsp;
</span>
<span class="btn btn-default " id="json" title="Export to .json" data-toggle="tooltip">
<i class="fa fa-file-code-o"></i>
Expand Down
2 changes: 1 addition & 1 deletion panoramix/assets/stylesheets/panoramix.css
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ legend.legend-style {
font-weight: bold;
}
.nvtooltip {
position: relative !important;
//position: relative !important;
z-index: 888;
}

Expand Down
8 changes: 6 additions & 2 deletions panoramix/assets/visualizations/pivot_table.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
.gridster li.widget.pivot_table,
div.widget.pivot_table{
.gridster .widget.pivot_table {
overflow: auto !important;
}

.widget.table td {
padding: 1px 5px;
font-size: small;
}
8 changes: 6 additions & 2 deletions panoramix/assets/visualizations/table.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
.gridster li.widget.table,
div.widget.table {
.gridster .widget.table {
overflow: auto !important;
}

.widget.table td.filtered {
background-color: #005a63;
color: white;
}

.widget.table td {
padding: 1px 5px;
font-size: small;
}

0 comments on commit 71073d8

Please sign in to comment.