Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
9ab5eeb7
Commit
9ab5eeb7
authored
Feb 04, 2019
by
Johannes Schill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: Explore: Query wrapping on long queries #15222
parent
d4ecba52
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
8 deletions
+20
-8
packages/grafana-ui/src/components/Select/SelectOptionGroup.tsx
+1
-1
public/app/features/dashboard/panel_editor/QueriesTab.tsx
+1
-1
public/app/features/explore/QueryRow.tsx
+2
-2
public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
+3
-3
public/sass/components/_gf-form.scss
+4
-0
public/sass/utils/_utils.scss
+9
-1
No files found.
packages/grafana-ui/src/components/Select/SelectOptionGroup.tsx
View file @
9ab5eeb7
...
...
@@ -49,7 +49,7 @@ export default class SelectOptionGroup extends PureComponent<ExtendedGroupProps,
return
(
<
div
className=
"gf-form-select-box__option-group"
>
<
div
className=
"gf-form-select-box__option-group__header"
onClick=
{
this
.
onToggleChildren
}
>
<
span
className=
"flex-grow"
>
{
label
}
</
span
>
<
span
className=
"flex-grow
-1
"
>
{
label
}
</
span
>
<
i
className=
{
`fa ${expanded ? 'fa-caret-left' : 'fa-caret-down'}`
}
/>
{
' '
}
</
div
>
{
expanded
&&
children
}
...
...
public/app/features/dashboard/panel_editor/QueriesTab.tsx
View file @
9ab5eeb7
...
...
@@ -133,7 +133,7 @@ export class QueriesTab extends PureComponent<Props, State> {
return
(
<>
<
DataSourcePicker
datasources=
{
this
.
datasources
}
onChange=
{
this
.
onChangeDataSource
}
current=
{
currentDS
}
/>
<
div
className=
"flex-grow"
/>
<
div
className=
"flex-grow
-1
"
/>
{
!
isAddingMixed
&&
(
<
button
className=
"btn navbar-button navbar-button--primary"
onClick=
{
this
.
onAddQueryClick
}
>
Add Query
...
...
public/app/features/explore/QueryRow.tsx
View file @
9ab5eeb7
...
...
@@ -111,7 +111,7 @@ export class QueryRow extends PureComponent<QueryRowProps> {
<
div
className=
"query-row-status"
>
<
QueryTransactionStatus
transactions=
{
transactions
}
/>
</
div
>
<
div
className=
"query-row-field"
>
<
div
className=
"query-row-field
flex-shrink-1
"
>
{
QueryField
?
(
<
QueryField
datasource=
{
datasourceInstance
}
...
...
@@ -135,7 +135,7 @@ export class QueryRow extends PureComponent<QueryRowProps> {
/>
)
}
</
div
>
<
div
className=
"gf-form-inline"
>
<
div
className=
"gf-form-inline
flex-shrink-0
"
>
<
div
className=
"gf-form"
>
<
button
className=
"gf-form-label gf-form-label--btn"
onClick=
{
this
.
onClickClearButton
}
>
<
i
className=
"fa fa-times"
/>
...
...
public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
View file @
9ab5eeb7
...
...
@@ -249,15 +249,15 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
return
(
<>
<
div
className=
"gf-form-inline"
>
<
div
className=
"gf-form"
>
<
div
className=
"gf-form-inline
gf-form-inline--nowrap
"
>
<
div
className=
"gf-form
flex-shrink-0
"
>
<
Cascader
options=
{
metricsOptions
}
onChange=
{
this
.
onChangeMetrics
}
>
<
button
className=
"gf-form-label gf-form-label--btn"
disabled=
{
!
syntaxLoaded
}
>
{
chooserText
}
<
i
className=
"fa fa-caret-down"
/>
</
button
>
</
Cascader
>
</
div
>
<
div
className=
"gf-form gf-form--grow"
>
<
div
className=
"gf-form gf-form--grow
flex-shrink-1
"
>
<
QueryField
additionalPlugins=
{
this
.
plugins
}
cleanText=
{
cleanText
}
...
...
public/sass/components/_gf-form.scss
View file @
9ab5eeb7
...
...
@@ -84,6 +84,10 @@ $input-border: 1px solid $input-border-color;
.gf-form
+
.gf-form
{
margin-left
:
$gf-form-margin
;
}
&
--nowrap
{
flex-wrap
:
nowrap
;
}
}
.gf-form-button-row
{
...
...
public/sass/utils/_utils.scss
View file @
9ab5eeb7
...
...
@@ -83,10 +83,18 @@ button.close {
position
:
absolute
;
}
.flex-grow
{
.flex-grow
-1
{
flex-grow
:
1
;
}
.flex-shrink-1
{
flex-shrink
:
1
;
}
.flex-shrink-0
{
flex-shrink
:
0
;
}
.center-vh
{
display
:
flex
;
align-items
:
center
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment