mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Various css and markup fixes for changed css classes
This commit is contained in:
parent
26535e163f
commit
8a5c91021d
@ -27,7 +27,7 @@ function (angular, config, _, $, store) {
|
||||
utilSrv.init();
|
||||
|
||||
$scope.dashAlerts = alertSrv;
|
||||
$scope.grafana.style = 'dark';
|
||||
$scope.grafana.lightTheme = false;
|
||||
$scope.grafana.user = userSrv.getSignedInUser();
|
||||
$scope.grafana.sidemenu = store.getBool('grafana.sidemenu');
|
||||
$scope.topnav = { title: 'Grafana' };
|
||||
@ -101,7 +101,7 @@ function (angular, config, _, $, store) {
|
||||
}, function() {
|
||||
});
|
||||
|
||||
$scope.onAppEvent('setup-dashboard', function() {
|
||||
$scope.onAppEvent('dashboard-loaded', function() {
|
||||
count = 0;
|
||||
|
||||
setTimeout(function() {
|
||||
|
@ -60,18 +60,11 @@ function (angular, $, config, _) {
|
||||
|
||||
$scope.setWindowTitleAndTheme = function() {
|
||||
window.document.title = config.window_title_prefix + $scope.dashboard.title;
|
||||
$scope.grafana.style = $scope.dashboard.style;
|
||||
$scope.topnav.title = $scope.dashboard.title;
|
||||
$scope.topnav.icon = "fa fa-th-large";
|
||||
$scope.topnav.titleAction = function() { alert("hej"); };
|
||||
$scope.grafana.lightTheme = $scope.dashboard.style === 'light';
|
||||
};
|
||||
|
||||
$scope.isPanel = function(obj) {
|
||||
if(!_.isNull(obj) && !_.isUndefined(obj) && !_.isUndefined(obj.type)) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
$scope.styleUpdated = function() {
|
||||
$scope.grafana.lightTheme = $scope.dashboard.style === 'light';
|
||||
};
|
||||
|
||||
$scope.add_row = function(dash, row) {
|
||||
|
@ -144,10 +144,6 @@ function (angular, _, moment, config, store) {
|
||||
});
|
||||
};
|
||||
|
||||
$scope.styleUpdated = function() {
|
||||
$scope.grafana.style = $scope.dashboard.style;
|
||||
};
|
||||
|
||||
$scope.editJson = function() {
|
||||
$scope.appEvent('show-json-editor', { object: $scope.dashboard });
|
||||
};
|
||||
|
@ -60,6 +60,7 @@ function(angular, _, config) {
|
||||
this.open_modal = function() {
|
||||
var confirmModal = $modal({
|
||||
template: './app/partials/unsaved-changes.html',
|
||||
modalClass: 'confirm-modal',
|
||||
persist: true,
|
||||
show: false,
|
||||
scope: modalScope,
|
||||
|
@ -1,12 +1,12 @@
|
||||
<div class="modal-body">
|
||||
<div class="dashboard-editor-header">
|
||||
<div class="dashboard-editor-title">
|
||||
<div class="modal-body gf-box gf-box-no-margin">
|
||||
<div class="gf-box-header">
|
||||
<div class="gf-box-title">
|
||||
<i class="fa fa-check"></i>
|
||||
{{title}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="dashboard-editor-body">
|
||||
<div class="gf-box-body" style="min-height: 0px;">
|
||||
<p class="row-fluid text-center large">
|
||||
{{text}}
|
||||
<br>
|
||||
|
@ -1,12 +1,16 @@
|
||||
<div class="modal-body">
|
||||
<div class="dashboard-editor-header">
|
||||
<div class="dashboard-editor-title">
|
||||
<div class="modal-body gf-box-no-margin">
|
||||
<div class="gf-box-header">
|
||||
<div class="gf-box-title">
|
||||
<i class="fa fa-keyboard-o"></i>
|
||||
Keyboard shutcuts
|
||||
</div>
|
||||
|
||||
<button class="gf-box-header-close-btn" ng-click="dismiss();">
|
||||
<i class="fa fa-remove"></i>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="dashboard-editor-body">
|
||||
<div class="gf-box-body">
|
||||
<table class="shortcut-table">
|
||||
<tr>
|
||||
<th></th>
|
||||
@ -45,6 +49,3 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-info" ng-click="dismiss()">Close</button>
|
||||
</div>
|
||||
|
@ -1,6 +1,6 @@
|
||||
<div class="modal-body" ng-controller="InspectCtrl" ng-init="init()">
|
||||
<div class="dashboard-editor-header">
|
||||
<div class="dashboard-editor-title">
|
||||
<div class="modal-body gf-box gf-box-no-margin" ng-controller="InspectCtrl" ng-init="init()">
|
||||
<div class="gf-box-header">
|
||||
<div class="gf-box-title">
|
||||
<i class="fa fa-eye"></i>
|
||||
Inspector
|
||||
</div>
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="dashboard-editor-body">
|
||||
<div class="gf-box-body">
|
||||
|
||||
<div ng-if="editor.index == 0">
|
||||
<h5>Request details</h5>
|
||||
@ -72,9 +72,5 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-info" ng-click="dismiss()">Close</button>
|
||||
</div>
|
||||
|
@ -1,18 +1,20 @@
|
||||
<div class="modal-header">
|
||||
</div>
|
||||
|
||||
<div class="modal-body">
|
||||
<h4 class="text-center"><i class="fa fa-warning"></i> Unsaved changes</h4>
|
||||
<div class="row-fluid">
|
||||
<span class="span3">
|
||||
{{changes}}
|
||||
<div class="modal-body gf-box gf-box-no-margin">
|
||||
<div class="gf-box-header text-center">
|
||||
<span class="gf-box-title">
|
||||
<i class="fa fa-exclamation"></i>
|
||||
Unsaved changes
|
||||
</span>
|
||||
<button type="button" class="btn btn-success span2" ng-click="dismiss()">Cancel</button>
|
||||
<button type="button" class="btn btn-success span2" ng-click="save();dismiss();">Save</button>
|
||||
<button type="button" class="btn btn-warning span2" ng-click="ignore();dismiss();">Ignore</button>
|
||||
<span class="span3"></span>
|
||||
</div>
|
||||
<button class="gf-box-header-close-btn" ng-click="dismiss();">
|
||||
<i class="fa fa-remove"></i>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="gf-box-body" style="min-height: 0;">
|
||||
<div class="row-fluid text-center">
|
||||
<button type="button" class="btn btn-success span4" ng-click="save();dismiss();">Save</button>
|
||||
<button type="button" class="btn btn-danger span4" ng-click="ignore();dismiss();">Ignore</button>
|
||||
<button type="button" class="btn btn-inverse span4" ng-click="dismiss()">Cancel</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
</div>
|
||||
|
@ -9,6 +9,10 @@
|
||||
margin: 30px 0 0 0;
|
||||
}
|
||||
|
||||
.gf-box-no-margin {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.gf-box-header-close-btn {
|
||||
float: right;
|
||||
padding: 0;
|
||||
|
@ -582,9 +582,14 @@ div.flot-text {
|
||||
}
|
||||
}
|
||||
|
||||
.modal-body {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
// pre
|
||||
code, pre {
|
||||
background-color: @grafanaPanelBackground;
|
||||
color: @textColor;
|
||||
}
|
||||
|
||||
|
||||
|
@ -88,7 +88,7 @@
|
||||
position: fixed;
|
||||
left: 0px;
|
||||
right: 0px;
|
||||
top: 55px;
|
||||
top: 60px;
|
||||
height: 100%;
|
||||
padding: 0;
|
||||
background: @grafanaPanelBackground;
|
||||
|
@ -25,7 +25,7 @@
|
||||
</head>
|
||||
|
||||
<body ng-cloak ng-controller="GrafanaCtrl" ng-class="{'sidemenu-open': grafana.sidemenu}">
|
||||
<link rel="stylesheet" href="[[.AppSubUrl]]/css/grafana.light.min.css" ng-if="grafana.style === 'light'">
|
||||
<link rel="stylesheet" href="[[.AppSubUrl]]/css/grafana.light.min.css" ng-if="grafana.lightTheme">
|
||||
|
||||
<div class="sidemenu-canvas">
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user