Skip to content

Commit df46667

Browse files
committed
new styles
1 parent 76ee41b commit df46667

File tree

3 files changed

+29
-8
lines changed

3 files changed

+29
-8
lines changed

css/style.css

+17-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ body {
5353
grid-row-start: 2;
5454
grid-row-end: 3;
5555

56+
padding: 10px;
5657
background: #f6f6f6;
5758
border-bottom: 1px solid #c7c7c7;
5859

@@ -61,5 +62,20 @@ body {
6162
}
6263

6364
.dashboard-bar__top {
64-
flex: 0 50px;
65+
flex: 0 25px;
66+
display: flex;
67+
justify-content: space-between;
68+
align-items: center;
69+
}
70+
71+
.dashboard-bar__chart {
72+
flex: 1;
73+
}
74+
75+
#dashboard-bar-title {
76+
margin: 0;
77+
}
78+
79+
#dashboard-bar-select {
80+
min-width: 100px;
6581
}

index.html

+9-5
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,21 @@
4848
<div style="width: 100%; height: 100%;"></div>
4949
</div> -->
5050
</section>
51+
52+
<!-- Dashboard Bar -->
5153
<section class="dashboard-bar">
5254
<div class="dashboard-bar__top">
53-
<h4>XXXX</h4>
54-
<select name="" id="">
55+
<h4 id="dashboard-bar-title">-</h4>
56+
<select name="" id="dashboard-bar-select">
5557
<option value="">sad</option>
5658
</select>
57-
5859
</div>
59-
60-
<div id="bar-chart"></div>
60+
<div class="dashboard-bar__chart">
61+
<div id="bar-chart"></div>
62+
</div>
6163
</section>
64+
65+
<!-- Dashboard Pie -->
6266
<section class="dashboard-pie">
6367
<div id="pie-chart"></div>
6468
</section>

js/charts.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function loadBarChart(labels, series, name, modelData) {
66
data: series
77
}],
88
chart: {
9-
height: 350,
9+
height: '100%',
1010
type: 'bar',
1111
events: {
1212
dataPointSelection: function (event, chartContext, config) {
@@ -117,7 +117,8 @@ function loadPieChart(labels, series, name, modelData) {
117117
var options = {
118118
series: series,
119119
chart: {
120-
width: 380,
120+
// height: '100%',
121+
width: '100%',
121122
type: 'pie',
122123
events: {
123124
dataPointSelection: function (event, chartContext, config) {

0 commit comments

Comments
 (0)