IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

ux: minor updates to dashboard settings

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-12-12 12:02:44 +01:00
parent 0a8bd5d289
commit 7b0bbefb96
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/history/history.html
View File

@ -1,5 +1,5 @@
<h3 class="dashboard-settings__header">
<a ng-click="ctrl.switchMode('list')">Version History</a>
<a ng-click="ctrl.switchMode('list')">Versions</a>
<span ng-show="ctrl.mode === 'compare'">
&gt; Comparing {{ctrl.baseInfo.version}}
<i class="fa fa-arrows-h"></i>

2
public/app/features/dashboard/history/history.ts
View File

@ -1,5 +1,3 @@
///<reference path="../../../headers/common.d.ts" />
import './history_srv';
import _ from 'lodash';

2
public/app/features/dashboard/settings/settings.html
View File

@ -23,7 +23,7 @@
</aside>
<div class="dashboard-settings__content" ng-if="ctrl.viewId === 'settings'">
<h3 class="dashboard-settings__header">
<h3 class="dashboard-settings__header m-b-1">
General
</h3>

1
public/sass/components/_dashboard_settings.scss
View File

@ -35,7 +35,6 @@
.dashboard-settings__aside-header {
color: $text-muted;
font-size: $font-size-h3;
margin-bottom: 20px;
padding-right: 60px;
white-space: nowrap;

11
public/sass/components/_gf-form.scss
View File

@ -85,6 +85,14 @@ $input-border: 1px solid $input-border-color;
}
}
.gf-form-label + .gf-form-label {
margin-right: $gf-form-margin;
}
.gf-form + .gf-form {
margin-right: $gf-form-margin;
}
.gf-form-pre {
display: block;
flex-grow: 1;
@ -254,9 +262,6 @@ $input-border: 1px solid $input-border-color;
margin-right: $gf-form-margin;
line-height: $input-line-height;
font-size: $font-size-sm;
box-shadow: none;
@include border-radius($label-border-radius-sm);
border: $input-btn-border-width solid transparent;
flex-shrink: 0;
flex-grow: 0;

4
public/sass/components/_query_editor.scss
View File

@ -33,6 +33,10 @@
.gf-form-label {
margin-right: 2px;
}
.gf-form + .gf-form {
margin-right: 0;
}
}
.gf-form-query-content {