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

Merge branch 'panel-edit-ux' of github.com:grafana/grafana into panel-edit-ux

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-11-05 10:49:44 +01:00
commit 3e7cd5fa99
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/features/dashboard/dashgrid/PanelEditor.tsx
View File

@ -101,15 +101,12 @@ export class PanelEditor extends React.Component<PanelEditorProps, any> {
})}
<div className="panel-editor__aside-actions">
<a className="btn btn-link" onClick={this.onClose}>
<i className="fa fa-check" /> Close
</a>
<a className="btn btn-link" onClick={this.onClose}>
<i className="fa fa-trash" /> Discard
</a>
<a className="btn btn-link" onClick={this.onClose}>
<i className="fa fa-copy" /> Save as master type
</a>
<button className="btn btn-success" onClick={this.onClose}>
Back to dashboard
</button>
<button className="btn btn-inverse" onClick={this.onClose}>
Discard changes
</button>
</div>
</div>
<div className="panel-editor__content">

7
public/sass/components/_viz_editor.scss
View File

@ -140,11 +140,10 @@
flex-direction: column;
height: 100%;
flex-grow: 1;
padding: 30px 0 0 0;
padding: 60px 15px;
a {
text-align: left;
padding-left: 20px;
button {
margin-bottom: 10px;
}
}