opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 00:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

dasboard_history: some polish around styles & diff colors, and minor fixes

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-06-07 12:39:06 +02:00
parent ef1dfed0d8
commit 8f6c9c5946
6 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/dtos/dashboard.go
View File

@ -35,7 +35,7 @@ type DashboardRedirect struct {
type CalculateDiffOptions struct { type CalculateDiffOptions struct {
Base CalculateDiffTarget `json:"base" binding:"Required"` Base CalculateDiffTarget `json:"base" binding:"Required"`
New CalculateDiffTarget `json:"new" binding:"Required"` New CalculateDiffTarget `json:"new" binding:"Required"`
DiffType string `json:"DiffType" binding:"Required"` DiffType string `json:"diffType" binding:"Required"`
} }
type CalculateDiffTarget struct { type CalculateDiffTarget struct {

12
pkg/components/dashdiffs/formatter_basic.go
View File

@ -248,11 +248,11 @@ var (
<!-- Overview --> <!-- Overview -->
{{ if .Old }} {{ if .Old }}
<div class="change list-change diff-label">{{ .Old }}</div> <div class="diff-label">{{ .Old }}</div>
<i class="diff-arrow fa fa-long-arrow-right"></i> <i class="diff-arrow fa fa-long-arrow-right"></i>
{{ end }} {{ end }}
{{ if .New }} {{ if .New }}
<div class="change list-change diff-label">{{ .New }}</div> <div class="diff-label">{{ .New }}</div>
{{ end }} {{ end }}
{{ if .LineStart }} {{ if .LineStart }}
@ -289,11 +289,11 @@ var (
<div class="diff-change-item"> <div class="diff-change-item">
{{ if .Old }} {{ if .Old }}
<div class="change list-change diff-label">{{ .Old }}</div> <div class="diff-label">{{ .Old }}</div>
<i class="diff-arrow fa fa-long-arrow-right"></i> <i class="diff-arrow fa fa-long-arrow-right"></i>
{{ end }} {{ end }}
{{ if .New }} {{ if .New }}
<div class="change list-change diff-label">{{ .New }}</div> <div class="diff-label">{{ .New }}</div>
{{ end }} {{ end }}
</div> </div>
@ -301,7 +301,7 @@ var (
<diff-link-json <diff-link-json
line-link="{{ .LineStart }}" line-link="{{ .LineStart }}"
line-display="{{ .LineStart }}{{ if .LineEnd }} - {{ .LineEnd }}{{ end }}" line-display="{{ .LineStart }}{{ if .LineEnd }} - {{ .LineEnd }}{{ end }}"
switch-view="ctrl.getDiff('html')" switch-view="ctrl.getDiff('json')"
/> />
{{ end }} {{ end }}
</span> </span>
@ -326,7 +326,7 @@ var (
<diff-link-json <diff-link-json
line-link="{{ .LineStart }}" line-link="{{ .LineStart }}"
line-display="{{ .LineStart }}{{ if .LineEnd }} - {{ .LineEnd }}{{ end }}" line-display="{{ .LineStart }}{{ if .LineEnd }} - {{ .LineEnd }}{{ end }}"
switch-view="ctrl.getDiff('html')" switch-view="ctrl.getDiff('json')"
/> />
{{ end }} {{ end }}
</div> </div>

2
public/app/core/directives/diff-view.ts
View File

@ -71,7 +71,7 @@ export function linkJson() {
link: '@lineLink', link: '@lineLink',
switchView: '&', switchView: '&',
}, },
templateUrl: 'public/app/features/dashboard/history/partials/link-json.html', template: `<a class="diff-linenum btn btn-inverse btn-small" ng-click="ctrl.goToLine(link)">Line {{ line }}</a>`
}; };
} }
coreModule.directive('diffLinkJson', linkJson); coreModule.directive('diffLinkJson', linkJson);

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

@ -100,7 +100,7 @@
<aside class="edit-sidemenu-aside"> <aside class="edit-sidemenu-aside">
<ul class="edit-sidemenu"> <ul class="edit-sidemenu">
<li ng-class="{active: ctrl.diff === 'basic'}"><a ng-click="ctrl.getDiff('basic')" href="">Change Summary</a></li> <li ng-class="{active: ctrl.diff === 'basic'}"><a ng-click="ctrl.getDiff('basic')" href="">Change Summary</a></li>
<li ng-class="{active: ctrl.diff === 'html'}"><a ng-click="ctrl.getDiff('json')" href="">JSON Code View</a></li> <li ng-class="{active: ctrl.diff === 'html'}"><a ng-click="ctrl.getDiff('json')" href="">JSON Diff</a></li>
</ul> </ul>
</aside> </aside>

4
public/app/features/dashboard/history/partials/link-json.html
View File

@ -1,4 +0,0 @@
<a class="change list-linenum diff-linenum btn btn-inverse btn-small" ng-click="ctrl.goToLine(link)">
Line {{ line }}
</a>

10
public/sass/_variables.dark.scss
View File

@ -292,13 +292,13 @@ $diff-arrow-color: $white;
$diff-json-bg: $dark-4; $diff-json-bg: $dark-4;
$diff-json-fg: $gray-5; $diff-json-fg: $gray-5;
$diff-json-added: #2f5f40; $diff-json-added: #457740;
$diff-json-deleted: #862d2d; $diff-json-deleted: #a04338;
$diff-json-old: #5a372a; $diff-json-old: #a04338;
$diff-json-new: #664e33; $diff-json-new: #457740;
$diff-json-changed-fg: $gray-5; $diff-json-changed-fg: $gray-5;
$diff-json-changed-num: $text-muted; $diff-json-changed-num: $text-color;
$diff-json-icon: $gray-7; $diff-json-icon: $gray-7;