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 pull request #15494 from grafana/minor-tweaks-panel-edit

Browse Source 
Removed primary class from Add Query button, and changed name of panel options tab
This commit is contained in:
Torkel Ödegaard 2019-02-18 11:36:19 +01:00 committed by GitHub
commit a6cae5b2b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/panel_editor/GeneralTab.tsx
View File

@ -44,7 +44,7 @@ export class GeneralTab extends PureComponent<Props> {
render() { render() {
return ( return (
<EditorTabBody heading="Panel Options" toolbarItems={[]}> <EditorTabBody heading="General" toolbarItems={[]}>
<div ref={element => (this.element = element)} /> <div ref={element => (this.element = element)} />
</EditorTabBody> </EditorTabBody>
); );

2
public/app/features/dashboard/panel_editor/PanelEditor.tsx
View File

@ -45,7 +45,7 @@ interface PanelEditorTab {
const panelEditorTabTexts = { const panelEditorTabTexts = {
[PanelEditorTabIds.Queries]: 'Queries', [PanelEditorTabIds.Queries]: 'Queries',
[PanelEditorTabIds.Visualization]: 'Visualization', [PanelEditorTabIds.Visualization]: 'Visualization',
[PanelEditorTabIds.Advanced]: 'Panel Options', [PanelEditorTabIds.Advanced]: 'General',
[PanelEditorTabIds.Alert]: 'Alert', [PanelEditorTabIds.Alert]: 'Alert',
}; };

2
public/app/features/dashboard/panel_editor/QueriesTab.tsx
View File

@ -135,7 +135,7 @@ export class QueriesTab extends PureComponent<Props, State> {
<DataSourcePicker datasources={this.datasources} onChange={this.onChangeDataSource} current={currentDS} /> <DataSourcePicker datasources={this.datasources} onChange={this.onChangeDataSource} current={currentDS} />
<div className="flex-grow-1" /> <div className="flex-grow-1" />
{!isAddingMixed && ( {!isAddingMixed && (
<button className="btn navbar-button navbar-button--primary" onClick={this.onAddQueryClick}> <button className="btn navbar-button" onClick={this.onAddQueryClick}>
Add Query Add Query
</button> </button>
)} )}