Skip to content

Commit

Permalink
more chart realignment
Browse files Browse the repository at this point in the history
  • Loading branch information
Dave Conway-Jones committed Dec 19, 2016
1 parent 7b2b2fa commit a3c6e24
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
**Fixes**

- Gauges now scale properly on IE9/10/11 and Edge
- Increase chart size to better fill available space
- Fix colour-picker touch support (upstream fix)
- Fix slight transparency issue on select dropdown
- Small changes to colour-picker styling


### 2.2.0: Milestone Release
Expand Down
6 changes: 3 additions & 3 deletions dist/css/app.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/dashboard.appcache
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ fonts/fontawesome-webfont.woff2
NETWORK:
*

# hash: 73b9a150035197a53380b2090efbc2b0c5f8e0d4d35b42798bf4ec21b5cf3911
# hash: 6b2f5a904c3bf4a69926e8fe512b3c83a7367a8244ae507a58abfbedd9ce6779
2 changes: 1 addition & 1 deletion dist/js/app.min.js

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions src/components/ui-component/templates/chart.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
p.nr-dashboard-chart-title {
padding: 10px 0px 4px 10px;
padding: 10px 10px 4px 10px;
margin: 0px 0px 0px 0px;
font-weight: 500;
font-size: 1.1em;
Expand All @@ -23,7 +23,6 @@ p.blank-label {
height: 100%;
}


canvas.chart.chart-line {
/* full height - label_padding - label_height - nr-dashboard-chart_padding */
height: calc(100% + 22px) !important;
Expand All @@ -32,7 +31,7 @@ canvas.chart.chart-line {

.nr-dashboard-chart {
/* full height - label_padding - label_height - nr-dashboard-chart_padding */
height: calc(100% - 12px - 38px - 20px);
width: calc(100% - 20px);
padding: 10px;
height: calc(100% - 55px);
width: calc(100% - 10px);
padding: 5px;
}

0 comments on commit a3c6e24

Please sign in to comment.