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 #14954 from grafana/minor-style-change

Browse Source 
Panel edit mode style tweaks
This commit is contained in:
Torkel Ödegaard 2019-01-18 16:41:16 +01:00 committed by GitHub
commit a231e57c08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/features/dashboard/panel_editor/EditorTabBody.tsx
View File

@ -111,14 +111,11 @@ export class EditorTabBody extends PureComponent<Props, State> {
return ( return (
<> <>
<div className="toolbar"> <div className="toolbar">
<div className="toolbar__heading">{heading}</div> <div className="toolbar__left">
{renderToolbar && renderToolbar()} <div className="toolbar__heading">{heading}</div>
{toolbarItems.length > 0 && ( {renderToolbar && renderToolbar()}
<> </div>
<div className="gf-form--grow" /> {toolbarItems.map(item => this.renderButton(item))}
{toolbarItems.map(item => this.renderButton(item))}
</>
)}
</div> </div>
<div className="panel-editor__scroll"> <div className="panel-editor__scroll">
<CustomScrollbar autoHide={false} scrollTop={scrollTop} setScrollTop={setScrollTop}> <CustomScrollbar autoHide={false} scrollTop={scrollTop} setScrollTop={setScrollTop}>

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

@ -18,7 +18,7 @@ import config from 'app/core/config';
// Types // Types
import { PanelModel } from '../panel_model'; import { PanelModel } from '../panel_model';
import { DashboardModel } from '../dashboard_model'; import { DashboardModel } from '../dashboard_model';
import { DataQuery, DataSourceSelectItem } from '@grafana/ui/src/types'; import { DataQuery, DataSourceSelectItem } from '@grafana/ui/src/types';
import { PluginHelp } from 'app/core/components/PluginHelp/PluginHelp'; import { PluginHelp } from 'app/core/components/PluginHelp/PluginHelp';
interface Props { interface Props {
@ -133,14 +133,13 @@ export class QueriesTab extends PureComponent<Props, State> {
return ( return (
<> <>
<DataSourcePicker datasources={this.datasources} onChange={this.onChangeDataSource} current={currentDS} /> <DataSourcePicker datasources={this.datasources} onChange={this.onChangeDataSource} current={currentDS} />
<div className="m-l-2"> <div className="flex-grow" />
{!isAddingMixed && ( {!isAddingMixed && (
<button className="btn navbar-button navbar-button--primary" onClick={this.onAddQueryClick}> <button className="btn navbar-button navbar-button--primary" onClick={this.onAddQueryClick}>
Add Query Add Query
</button> </button>
)} )}
{isAddingMixed && this.renderMixedPicker()} {isAddingMixed && this.renderMixedPicker()}
</div>
</> </>
); );
}; };

6
public/sass/components/_toolbar.scss
View File

@ -16,6 +16,12 @@
padding-right: 20px; padding-right: 20px;
} }
.toolbar__left {
display: flex;
flex-grow: 1;
align-items: center;
}
.toolbar__main { .toolbar__main {
padding: 0 $input-padding-x; padding: 0 $input-padding-x;
font-size: $font-size-md; font-size: $font-size-md;