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

dashboard_history: further css & markup fixes, removing style overrides & resuing existing styles and markup components

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-06-06 23:04:14 +02:00
parent c4e872b9da
commit 948e5ae74d
5 changed files with 48 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/dashboard.go
View File

@@ -283,7 +283,7 @@ func GetDashboardVersions(c *middleware.Context) Response {
for _, version := range query.Result { for _, version := range query.Result {
if version.RestoredFrom == version.Version { if version.RestoredFrom == version.Version {
version.Message = "Initial save (created migration)" version.Message = "Initial save (created by migration)"
continue continue
} }

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

@@ -78,7 +78,7 @@
<div class="gf-form-group" ng-show="ctrl.mode === 'list'"> <div class="gf-form-group" ng-show="ctrl.mode === 'list'">
<div class="gf-form-button-row"> <div class="gf-form-button-row">
<a type="button" <a type="button"
class="btn gf-form-button btn-primary" class="btn gf-form-button btn-secondary"
ng-if="ctrl.revisions.length > 1" ng-if="ctrl.revisions.length > 1"
ng-class="{disabled: !ctrl.isComparable()}" ng-class="{disabled: !ctrl.isComparable()}"
ng-click="ctrl.getDiff(ctrl.diff)" ng-click="ctrl.getDiff(ctrl.diff)"
@@ -99,19 +99,15 @@
</div> </div>
</div> </div>
<div class="history-list" ng-if="ctrl.mode === 'compare'"> <div class="edit-tab-with-sidemenu" ng-if="ctrl.mode === 'compare'">
<div class="page-container"> <aside class="edit-sidemenu-aside">
<div class="page-body"> <ul class="edit-sidemenu">
<aside class="page-sidebar"> <li ng-class="{active: ctrl.diff === 'basic'}"><a ng-click="ctrl.getDiff('basic')" href="">Change Summary</a></li>
<section class="page-sidebar-section"> <li ng-class="{active: ctrl.diff === 'html'}"><a ng-click="ctrl.getDiff('html')" href="">JSON Code View</a></li>
<ul class="ui-list">
<li><a ng-class="{active: ctrl.diff === 'basic'}" ng-click="ctrl.getDiff('basic')" href="">Change Summary</a></li>
<li><a ng-class="{active: ctrl.diff === 'html'}" ng-click="ctrl.getDiff('html')" href="">JSON Code View</a></li>
</ul> </ul>
</section>
</aside> </aside>
<div class="tab-content page-content-with-sidebar"> <div class="edit-tab-content">
<div ng-if="ctrl.loading"> <div ng-if="ctrl.loading">
<i class="fa fa-spinner fa-spin"></i> <i class="fa fa-spinner fa-spin"></i>
<em>Fetching changes&hellip;</em> <em>Fetching changes&hellip;</em>
@@ -119,7 +115,7 @@
<div ng-if="!ctrl.loading" ng-init="new = ctrl.selected[0]; original = ctrl.selected[1]"> <div ng-if="!ctrl.loading" ng-init="new = ctrl.selected[0]; original = ctrl.selected[1]">
<a type="button" <a type="button"
class="btn gf-form-button btn-primary diff-restore-btn" class="btn gf-form-button btn-secondary pull-right"
ng-click="ctrl.restore(new)" ng-click="ctrl.restore(new)"
ng-if="ctrl.isOriginalCurrent()"> ng-if="ctrl.isOriginalCurrent()">
<i class="fa fa-rotate-right" ></i>&nbsp;&nbsp;Restore to version {{new}} <i class="fa fa-rotate-right" ></i>&nbsp;&nbsp;Restore to version {{new}}
@@ -151,6 +147,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>

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

@@ -286,9 +286,6 @@ $footer-link-hover: $gray-4;
$diff-label-bg: $dark-2; $diff-label-bg: $dark-2;
$diff-label-fg: $white; $diff-label-fg: $white;
$diff-switch-bg: $dark-5;
$diff-switch-disabled: $gray-1;
$diff-group-bg: $dark-4; $diff-group-bg: $dark-4;
$diff-arrow-color: $white; $diff-arrow-color: $white;

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

@@ -10,7 +10,6 @@
} }
.edit-sidemenu-aside { .edit-sidemenu-aside {
min-width: 6rem;
margin-right: $spacer*2; margin-right: $spacer*2;
} }

31
public/sass/pages/_history.scss
View File

@@ -1,30 +1,3 @@
// Diff View
.history-list {
h4 {
margin-bottom: 0.75em;
}
.page-container {
padding: 0;
background: none;
}
.page-sidebar {
margin-left: 0;
margin-right: 3em;
}
.small.muted { margin-bottom: 0.25em; }
.ui-list > li {
margin-bottom: 1.5em;
& > a { padding-left: 15px; }
& > a.active { @include left-brand-border-gradient(); }
}
}
// Actual Diff // Actual Diff
#delta { #delta {
margin: 2em 0; margin: 2em 0;
@@ -105,10 +78,6 @@
.diff-item-added, .diff-item-deleted { list-style: none; } .diff-item-added, .diff-item-deleted { list-style: none; }
.diff-restore-btn {
float: right;
}
.diff-group { .diff-group {
background: $diff-group-bg; background: $diff-group-bg;
font-size: 16px; font-size: 16px;