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
a3e22091
Commit
a3e22091
authored
Feb 24, 2016
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux(submenu): tight-form -> gf-form
parent
17b7dfb2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
10 deletions
+32
-10
public/app/features/dashboard/submenu/submenu.html
+4
-7
public/app/partials/valueSelectDropdown.html
+2
-2
public/sass/components/_submenu.scss
+26
-1
No files found.
public/app/features/dashboard/submenu/submenu.html
View file @
a3e22091
<div
class=
"submenu-controls"
>
<div
class=
"tight-form borderless"
>
<ul
class=
"tight-form-list"
ng-if=
"ctrl.dashboard.templating.list.length > 0"
>
<ul
ng-if=
"ctrl.dashboard.templating.list.length > 0"
>
<li
ng-repeat=
"variable in ctrl.variables"
class=
"submenu-item"
>
<span
class=
"template-variable tight-form-item"
ng-show=
"!variable.hideLabel"
style=
"padding-right: 5px
"
>
<span
class=
"submenu-item-label template-variable "
ng-show=
"!variable.hideLabel
"
>
{{variable.label || variable.name}}:
</span>
<value-select-dropdown
variable=
"variable"
on-updated=
"ctrl.variableUpdated(variable)"
get-values-for-tag=
"ctrl.getValuesForTag(variable, tagKey)"
></value-select-dropdown>
</li>
</ul>
<ul
class=
"tight-form-list"
ng-if=
"ctrl.dashboard.annotations.list.length > 0"
>
<ul
ng-if=
"ctrl.dashboard.annotations.list.length > 0"
>
<li
ng-repeat=
"annotation in ctrl.dashboard.annotations.list"
class=
"submenu-item annotation-segment"
ng-class=
"{'annotation-disabled': !annotation.enable}"
>
<a
ng-click=
"ctrl.disableAnnotation(annotation)"
>
<i
class=
"fa fa-bolt"
style=
"color:{{annotation.iconColor}}"
></i>
...
...
@@ -21,10 +19,9 @@
</li>
</ul>
<ul
class=
"tight-form-list
pull-right"
ng-if=
"ctrl.dashboard.links.length > 0"
>
<ul
class=
"
pull-right"
ng-if=
"ctrl.dashboard.links.length > 0"
>
<dash-links-container
links=
"ctrl.dashboard.links"
></dash-links-container>
</ul>
<div
class=
"clearfix"
></div>
</div>
</div>
public/app/partials/valueSelectDropdown.html
View file @
a3e22091
<div
class=
"variable-link-wrapper"
>
<a
ng-click=
"vm.show()"
class=
"variable-value-link
tight-form-item
"
>
<a
ng-click=
"vm.show()"
class=
"variable-value-link"
>
{{vm.linkText}}
<span
ng-repeat=
"tag in vm.selectedTags"
bs-tooltip=
'tag.valuesText'
data-placement=
"bottom"
>
<span
class=
"label-tag"
tag-color-from-name=
"tag.text"
>
...
...
@@ -10,7 +10,7 @@
<i
class=
"fa fa-caret-down"
></i>
</a>
<input
type=
"text"
class=
"
tight-form-clear
-input input-small"
style=
"display: none"
ng-keydown=
"vm.keyDown($event)"
ng-model=
"vm.search.query"
ng-change=
"vm.queryChanged()"
></input>
<input
type=
"text"
class=
"
hidden
-input input-small"
style=
"display: none"
ng-keydown=
"vm.keyDown($event)"
ng-model=
"vm.search.query"
ng-change=
"vm.queryChanged()"
></input>
<div
class=
"variable-value-dropdown"
ng-if=
"vm.dropdownVisible"
ng-class=
"{'multi': vm.variable.multi, 'single': !vm.variable.multi}"
>
<div
class=
"variable-options-wrapper"
>
...
...
public/sass/components/_submenu.scss
View file @
a3e22091
.submenu-controls
{
margin
:
10px
5px
;
margin
:
0
5px
;
font-size
:
16px
;
}
...
...
@@ -23,6 +23,7 @@
border
:
$panel-border
;
margin-right
:
10px
;
display
:
inline-block
;
float
:
left
;
.fa-caret-down
{
font-size
:
75%
;
...
...
@@ -37,11 +38,35 @@
.label-tag
{
margin
:
0
5px
;
}
padding
:
8px
7px
;
box-sizing
:
content-box
;
display
:
inline-block
;
font-weight
:
normal
;
display
:
inline-block
;
color
:
$text-color
;
}
.submenu-item-label
{
padding
:
8px
0px
8px
7px
;
box-sizing
:
content-box
;
display
:
inline-block
;
font-weight
:
normal
;
display
:
inline-block
;
}
.variable-link-wrapper
{
display
:
inline-block
;
position
:
relative
;
.hidden-input
{
padding
:
8px
7px
;
border
:
none
;
margin
:
0px
;
background
:
transparent
;
border-radius
:
0
;
border-right
:
1px
solid
$tight-form-border
;
}
}
.variable-value-dropdown
{
...
...
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