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
a6c4ba4d
Unverified
Commit
a6c4ba4d
authored
Nov 30, 2018
by
Torkel Ödegaard
Committed by
GitHub
Nov 30, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14242 from grafana/various-style-fixes
Fixed styling issues with new checkbox style
parents
e55a0cce
cc210b11
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
27 additions
and
36 deletions
+27
-36
public/app/core/components/manage_dashboards/manage_dashboards.html
+1
-1
public/app/core/components/search/search_results.html
+4
-4
public/app/plugins/datasource/testdata/datasource.ts
+7
-0
public/sass/components/_dashboard_list.scss
+1
-0
public/sass/components/_gf-form.scss
+0
-13
public/sass/components/_switch.scss
+7
-18
public/sass/utils/_utils.scss
+7
-0
No files found.
public/app/core/components/manage_dashboards/manage_dashboards.html
View file @
a6c4ba4d
...
...
@@ -67,7 +67,7 @@
<gf-form-checkbox
on-change=
"ctrl.onSelectAllChanged()"
checked=
"ctrl.selectAllChecked"
switch-class=
"gf-form-
switch
--transparent"
switch-class=
"gf-form-
checkbox
--transparent"
/>
<div
class=
"search-results-filter-row__filters"
>
<div
class=
"gf-form-select-wrapper"
ng-show=
"!(ctrl.canMove || ctrl.canDelete)"
>
...
...
public/app/core/components/search/search_results.html
View file @
a6c4ba4d
<div
ng-repeat=
"section in ctrl.results"
class=
"search-section"
>
<div
class=
"search-section__header pointer"
ng-hide=
"section.hideHeader"
ng-class=
"{'selected': section.selected}"
ng-click=
"ctrl.toggleFolderExpand(section)"
>
<div
ng-click=
"ctrl.toggleSelection(section, $event)"
>
<div
ng-click=
"ctrl.toggleSelection(section, $event)"
class=
"center-vh"
>
<gf-form-checkbox
ng-show=
"ctrl.editable"
on-change=
"ctrl.selectionChanged($event)"
checked=
"section.checked"
switch-class=
"gf-form-
switch--transparent gf-form-switch--search-result__section
"
>
switch-class=
"gf-form-
checkbox--transparent
"
>
</gf-form-checkbox>
</div>
<i
class=
"search-section__header__icon"
ng-class=
"section.icon"
></i>
...
...
@@ -21,12 +21,12 @@
<div
ng-if=
"section.expanded"
>
<a
ng-repeat=
"item in section.items"
class=
"search-item search-item--indent"
ng-class=
"{'selected': item.selected}"
ng-href=
"{{::item.url}}"
>
<div
ng-click=
"ctrl.toggleSelection(item, $event)"
>
<div
ng-click=
"ctrl.toggleSelection(item, $event)"
class=
"center-vh"
>
<gf-form-checkbox
ng-show=
"ctrl.editable"
on-change=
"ctrl.selectionChanged()"
checked=
"item.checked"
switch-class=
"gf-form-
switch--transparent gf-form-switch--search-result__item
"
>
switch-class=
"gf-form-
checkbox--transparent
"
>
</gf-form-checkbox>
</div>
<span
class=
"search-item__icon"
>
...
...
public/app/plugins/datasource/testdata/datasource.ts
View file @
a6c4ba4d
...
...
@@ -84,6 +84,13 @@ class TestDataDatasource {
}
return
this
.
$q
.
when
(
events
);
}
testDatasource
()
{
return
Promise
.
resolve
({
status
:
'success'
,
message
:
'Data source is working'
,
});
}
}
export
{
TestDataDatasource
};
public/sass/components/_dashboard_list.scss
View file @
a6c4ba4d
...
...
@@ -12,6 +12,7 @@
height
:
35px
;
display
:
flex
;
justify-content
:
space-between
;
align-items
:
center
;
.gf-form-button-row
{
padding-top
:
0
;
...
...
public/sass/components/_gf-form.scss
View file @
a6c4ba4d
...
...
@@ -141,19 +141,6 @@ $input-border: 1px solid $input-border-color;
@include
border-radius
(
$label-border-radius-sm
);
}
.gf-form-checkbox
{
flex-shrink
:
0
;
padding
:
$input-padding-y
$input-padding-x
;
line-height
:
$input-line-height
;
.checkbox-label
{
display
:
inline
;
cursor
:
pointer
;
padding
:
$input-padding-y
0
.4rem
;
line-height
:
$input-line-height
;
}
}
.gf-form-textarea
{
max-width
:
650px
;
}
...
...
public/sass/components/_switch.scss
View file @
a6c4ba4d
...
...
@@ -78,6 +78,9 @@ input:checked + .gf-form-switch__slider::before {
border
:
1px
solid
$input-border-color
;
border-left
:
none
;
border-radius
:
$input-border-radius
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
input
{
opacity
:
0
;
...
...
@@ -88,25 +91,14 @@ input:checked + .gf-form-switch__slider::before {
&
--transparent
{
background
:
transparent
;
border
:
none
;
}
&
--search-result__section
{
width
:
3
.05rem
;
width
:
20px
;
height
:
auto
;
position
:
relative
;
top
:
-5px
;
left
:
3px
;
}
&
--search-result__item
{
width
:
2
.7rem
;
height
:
auto
;
position
:
relative
;
top
:
3px
;
padding-left
:
7px
;
}
&
--table-cell
{
width
:
4
0px
;
width
:
2
0px
;
background
:
transparent
;
height
:
auto
;
border
:
none
;
...
...
@@ -116,17 +108,14 @@ input:checked + .gf-form-switch__slider::before {
}
.gf-form-switch__checkbox
{
position
:
absolute
;
left
:
16px
;
height
:
16px
;
width
:
16px
;
border-radius
:
3px
;
border
:
$checkbox-border
;
background
:
$checkbox-bg
;
top
:
8px
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
justify-content
:
center
;
}
input
:checked
+
.gf-form-switch__checkbox
::before
{
...
...
public/sass/utils/_utils.scss
View file @
a6c4ba4d
...
...
@@ -82,3 +82,10 @@ button.close {
.absolute
{
position
:
absolute
;
}
.center-vh
{
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
justify-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