Commit a6cae5b2 by Torkel Ödegaard Committed by GitHub

Merge pull request #15494 from grafana/minor-tweaks-panel-edit

Removed primary class from Add Query button, and changed name of panel options tab
parents 7db7a699 bf826d7c
...@@ -44,7 +44,7 @@ export class GeneralTab extends PureComponent<Props> { ...@@ -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>
); );
......
...@@ -45,7 +45,7 @@ interface PanelEditorTab { ...@@ -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',
}; };
......
...@@ -135,7 +135,7 @@ export class QueriesTab extends PureComponent<Props, State> { ...@@ -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>
)} )}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment