Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix wrong height on rows #39

Merged
merged 1 commit into from
Apr 10, 2013
Merged

fix wrong height on rows #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/css/bootstrap.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions common/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
color: #000;
}

.main {
box-shadow:0 3px 5px rgba(0, 0, 0, 0.4) inset, 0 -3px 5px rgba(0, 0, 0, 0.4) inset;
}

.kibana-row {
margin-left: 15px;
margin-bottom: 15px;
Expand All @@ -15,6 +19,10 @@
color: #eee;
}

.navbar-inner {
border-width: 0 0 0px;
}

.row-close {
color: #bbb;
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</div>
</div>
</div>
<div class="container-fluid">
<div class="container-fluid main">
<div class="row-fluid">
<div ng-view></div>
</div>
Expand Down
16 changes: 10 additions & 6 deletions js/controllers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ angular.module('kibana.controllers', [])
};
};

$scope.row_style = function(row) {
return { 'min-height': row.collapse ? '5px' : row.height }
}

$scope.alert = function(title,text,severity,timeout) {
var alert = {
title: title,
Expand Down Expand Up @@ -96,15 +100,15 @@ angular.module('kibana.controllers', [])
_.defaults($scope.row,_d)


$scope.init = function(){
$scope.init = function() {
$scope.reset_panel();
}

$scope.toggle_row = function(row) {
row.collapse = row.collapse ? false : true;
if (!row.collapse) {
$timeout(function() {
$scope.send_render();
$scope.$broadcast('render')
});
}
}
Expand All @@ -120,11 +124,11 @@ angular.module('kibana.controllers', [])

$scope.reset_panel = function() {
$scope.panel = {
loading: false,
error: false,
span: 3,
loading : false,
error : false,
span : 3,
editable: true,
group: ['default'],
group : ['default'],
};
};

Expand Down
10 changes: 8 additions & 2 deletions panels/histogram/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ angular.module('kibana.histogram', [])
steps: false
},
bars: { show: scope.panel.bars, fill: 1, barWidth: barwidth/1.8 },
points: { show: scope.panel.points, fill: 1, fillColor: false},
points: { show: scope.panel.points, fill: 1, fillColor: false, radius: 5},
shadowSize: 1
},
yaxis: { show: scope.panel['y-axis'], min: 0, color: "#000" },
Expand All @@ -258,7 +258,13 @@ angular.module('kibana.histogram', [])
color: "#eee",
hoverable: true,
},
colors: ['#EB6841','#00A0B0','#6A4A3C','#EDC951','#CC333F']
colors: ['#86B22D',
'#BF6730',
'#1D7373',
'#BFB930',
'#BF3030',
'#77207D'
]
})

// Work around for missing legend at initialization
Expand Down
2 changes: 1 addition & 1 deletion panels/hits/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ angular.module('kibana.hits', [])
color: "#eee",
hoverable: true,
},
colors: ['#EB6841','#00A0B0','#6A4A3C','#EDC951','#CC333F']
colors: ['#86B22D','#BF6730','#1D7373','#BFB930','#BF3030','#77207D']
})

// Work around for missing legend at initialization
Expand Down
2 changes: 1 addition & 1 deletion panels/pie/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ angular.module('kibana.pie', [])
//grid: { hoverable: true, clickable: true },
grid: { hoverable: true, clickable: true },
legend: { show: false },
colors: ['#EB6841','#00A0B0','#6A4A3C','#EDC951','#CC333F']
colors: ['#86B22D','#BF6730','#1D7373','#BFB930','#BF3030','#77207D']
};

// Populate element
Expand Down
2 changes: 1 addition & 1 deletion partials/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="row-fluid container" style="margin-top:10px">
<!-- Rows -->
<div ng-controller="dashcontrol" ng-init="init()"></div>
<div class="row-fluid kibana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboards.rows" style="min-height:{{row.height}};">
<div class="row-fluid kibana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboards.rows" ng-style="row_style(row)">
<div class="row-control">
<div class="row-fluid row-header" style="padding:0px;margin:0px;height:0px">
<div style="vertical-align:bottom">
Expand Down