jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

more responsive charts layout

pull/3/head
alex 2015-12-23 13:05:08 +03:00
parent 1d59d3be9e
commit 418d4ec106
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/pages/charts/amCharts/charts.html
View File

@ -1,21 +1,21 @@
<div class="widgets"> <div class="widgets">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-lg-4 col-md-6">
<blur-panel title="Bar Chart" class-container="with-scroll"> <blur-panel title="Bar Chart" class-container="with-scroll">
<div ng-include="'app/pages/charts/amCharts/barChart/barChart.html'"></div> <div ng-include="'app/pages/charts/amCharts/barChart/barChart.html'"></div>
</blur-panel> </blur-panel>
</div> </div>
<div class="col-md-4"> <div class="col-lg-4 col-md-6">
<blur-panel title="Line Chart" class-container="with-scroll">
<div ng-include="'app/pages/charts/amCharts/lineChart/lineChart.html'"></div>
</blur-panel>
</div>
<div class="col-md-4">
<blur-panel title="Area Chart" class-container="with-scroll" > <blur-panel title="Area Chart" class-container="with-scroll" >
<div ng-include="'app/pages/charts/amCharts/areaChart/areaChart.html'"></div> <div ng-include="'app/pages/charts/amCharts/areaChart/areaChart.html'"></div>
</blur-panel> </blur-panel>
</div> </div>
<div class="col-lg-4 col-md-12">
<blur-panel title="Line Chart" class-container="with-scroll">
<div ng-include="'app/pages/charts/amCharts/lineChart/lineChart.html'"></div>
</blur-panel>
</div>
</div> </div>
<div class="row"> <div class="row">

2
src/app/pages/charts/amCharts/lineChart/LineChartCtrl.js
View File

@ -148,7 +148,7 @@
} }
function zoomChart() { function zoomChart() {
lineChart.zoomToIndexes(Math.round(chart.dataProvider.length * 0.4), Math.round(chart.dataProvider.length * 0.55)); lineChart.zoomToIndexes(Math.round(lineChart.dataProvider.length * 0.4), Math.round(lineChart.dataProvider.length * 0.55));
} }
} }

6
src/app/pages/charts/chartJs/chartJs.html
View File

@ -39,7 +39,7 @@
<div class="row "> <div class="row ">
<div class="col-md-4 " ng-controller="chartJs2DCtrl"> <div class="col-lg-4 col-md-6" ng-controller="chartJs2DCtrl">
<blur-panel title="Radar" class-container="with-scroll "> <blur-panel title="Radar" class-container="with-scroll ">
<canvas id="radar" class="chart chart-radar" <canvas id="radar" class="chart chart-radar"
chart-legend="false" chart-series="series" chart-data="data" chart-labels="labels" chart-legend="false" chart-series="series" chart-data="data" chart-labels="labels"
@ -47,13 +47,13 @@
</canvas> </canvas>
</blur-panel> </blur-panel>
</div> </div>
<div class="col-md-4 " ng-controller="chartJs2DCtrl"> <div class="col-lg-4 col-md-6" ng-controller="chartJs2DCtrl">
<blur-panel title="Line" class-container="with-scroll "> <blur-panel title="Line" class-container="with-scroll ">
<canvas id="line" class="chart chart-line" chart-data="data" chart-labels="labels" <canvas id="line" class="chart chart-line" chart-data="data" chart-labels="labels"
chart-legend="false" chart-series="series" chart-click="changeData"></canvas> chart-legend="false" chart-series="series" chart-click="changeData"></canvas>
</blur-panel> </blur-panel>
</div> </div>
<div class="col-md-4 " ng-controller="chartJs2DCtrl"> <div class="col-lg-4 col-md-12" ng-controller="chartJs2DCtrl">
<blur-panel title="Bars" class-container="with-scroll "> <blur-panel title="Bars" class-container="with-scroll ">
<canvas id="bar" class="chart chart-bar" <canvas id="bar" class="chart chart-bar"
chart-data="data" chart-labels="labels" chart-series="series" chart-click="changeData"> chart-data="data" chart-labels="labels" chart-series="series" chart-click="changeData">