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
ffae3e7a
Commit
ffae3e7a
authored
Oct 10, 2018
by
Johannes Schill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename css class "gf-form-select2" to "gf-form-select-box" #13425
parent
9afcef98
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
41 additions
and
39 deletions
+41
-39
public/app/core/components/PermissionList/AddPermission.tsx
+1
-1
public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
+1
-1
public/app/core/components/PermissionList/PermissionListItem.tsx
+1
-1
public/app/core/components/Picker/DescriptionPicker.tsx
+1
-1
public/app/core/components/Picker/IndicatorsContainer.tsx
+3
-1
public/app/core/components/Picker/TeamPicker.tsx
+1
-1
public/app/core/components/Picker/UserPicker.tsx
+1
-1
public/app/core/components/Picker/__snapshots__/TeamPicker.test.tsx.snap
+6
-6
public/app/core/components/Picker/__snapshots__/UserPicker.test.tsx.snap
+6
-6
public/app/core/components/TagFilter/TagFilter.tsx
+1
-1
public/app/features/explore/Explore.tsx
+1
-1
public/sass/components/_form_select_box.scss
+18
-18
No files found.
public/app/core/components/PermissionList/AddPermission.tsx
View file @
ffae3e7a
...
...
@@ -121,7 +121,7 @@ class AddPermissions extends Component<Props, NewDashboardAclItem> {
optionsWithDesc=
{
dashboardPermissionLevels
}
onSelected=
{
this
.
onPermissionChanged
}
disabled=
{
false
}
className=
{
'gf-form-select
2
__control--menu-right'
}
className=
{
'gf-form-select
-box
__control--menu-right'
}
/>
</
div
>
...
...
public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
View file @
ffae3e7a
...
...
@@ -27,7 +27,7 @@ export default class DisabledPermissionListItem extends Component<Props, any> {
optionsWithDesc=
{
dashboardPermissionLevels
}
onSelected=
{
()
=>
{}
}
disabled=
{
true
}
className=
{
'gf-form-select
2
__control--menu-right'
}
className=
{
'gf-form-select
-box
__control--menu-right'
}
/>
</
div
>
</
td
>
...
...
public/app/core/components/PermissionList/PermissionListItem.tsx
View file @
ffae3e7a
...
...
@@ -78,7 +78,7 @@ export default class PermissionsListItem extends PureComponent<Props> {
optionsWithDesc=
{
dashboardPermissionLevels
}
onSelected=
{
this
.
onPermissionChanged
}
disabled=
{
item
.
inherited
}
className=
{
'gf-form-select
2
__control--menu-right'
}
className=
{
'gf-form-select
-box
__control--menu-right'
}
/>
</
div
>
</
td
>
...
...
public/app/core/components/Picker/DescriptionPicker.tsx
View file @
ffae3e7a
...
...
@@ -29,7 +29,7 @@ class DescriptionPicker extends Component<Props, any> {
<
div
className=
"permissions-picker"
>
<
Select
placeholder=
"Choose"
classNamePrefix=
{
`gf-form-select
2
`
}
classNamePrefix=
{
`gf-form-select
-box
`
}
className=
{
`width-7 gf-form-input gf-form-input--form-dropdown ${className || ''}`
}
options=
{
optionsWithDesc
}
components=
{
{
...
...
public/app/core/components/Picker/IndicatorsContainer.tsx
View file @
ffae3e7a
...
...
@@ -5,7 +5,9 @@ export const IndicatorsContainer = props => {
const
isOpen
=
props
.
selectProps
.
menuIsOpen
;
return
(
<
components
.
IndicatorsContainer
{
...
props
}
>
<
span
className=
{
`gf-form-select2__select-arrow ${isOpen ? `
gf
-
form
-
select2__select
-
arrow
--
reversed
` : ''}`
}
/>
<
span
className=
{
`gf-form-select-box__select-arrow ${isOpen ? `
gf
-
form
-
select
-
box__select
-
arrow
--
reversed
` : ''}`
}
/>
</
components
.
IndicatorsContainer
>
);
};
...
...
public/app/core/components/Picker/TeamPicker.tsx
View file @
ffae3e7a
...
...
@@ -62,7 +62,7 @@ export class TeamPicker extends Component<Props, State> {
return
(
<
div
className=
"user-picker"
>
<
AsyncSelect
classNamePrefix=
{
`gf-form-select
2
`
}
classNamePrefix=
{
`gf-form-select
-box
`
}
isMulti=
{
false
}
isLoading=
{
isLoading
}
defaultOptions=
{
true
}
...
...
public/app/core/components/Picker/UserPicker.tsx
View file @
ffae3e7a
...
...
@@ -57,7 +57,7 @@ export class UserPicker extends Component<Props, State> {
return
(
<
div
className=
"user-picker"
>
<
AsyncSelect
classNamePrefix=
{
`gf-form-select
2
`
}
classNamePrefix=
{
`gf-form-select
-box
`
}
isMulti=
{
false
}
isLoading=
{
isLoading
}
defaultOptions=
{
true
}
...
...
public/app/core/components/Picker/__snapshots__/TeamPicker.test.tsx.snap
View file @
ffae3e7a
...
...
@@ -9,15 +9,15 @@ exports[`TeamPicker renders correctly 1`] = `
onKeyDown={[Function]}
>
<div
className="css-0 gf-form-select
2
__control"
className="css-0 gf-form-select
-box
__control"
onMouseDown={[Function]}
onTouchEnd={[Function]}
>
<div
className="css-0 gf-form-select
2
__value-container"
className="css-0 gf-form-select
-box
__value-container"
>
<div
className="css-0 gf-form-select
2
__placeholder"
className="css-0 gf-form-select
-box
__placeholder"
>
Select a team
</div>
...
...
@@ -25,7 +25,7 @@ exports[`TeamPicker renders correctly 1`] = `
className="css-0"
>
<div
className="gf-form-select
2
__input"
className="gf-form-select
-box
__input"
style={
Object {
"display": "inline-block",
...
...
@@ -108,10 +108,10 @@ exports[`TeamPicker renders correctly 1`] = `
</div>
</div>
<div
className="css-0 gf-form-select
2
__indicators"
className="css-0 gf-form-select
-box
__indicators"
>
<span
className="gf-form-select
2
__select-arrow "
className="gf-form-select
-box
__select-arrow "
/>
</div>
</div>
...
...
public/app/core/components/Picker/__snapshots__/UserPicker.test.tsx.snap
View file @
ffae3e7a
...
...
@@ -9,15 +9,15 @@ exports[`UserPicker renders correctly 1`] = `
onKeyDown={[Function]}
>
<div
className="css-0 gf-form-select
2
__control"
className="css-0 gf-form-select
-box
__control"
onMouseDown={[Function]}
onTouchEnd={[Function]}
>
<div
className="css-0 gf-form-select
2
__value-container"
className="css-0 gf-form-select
-box
__value-container"
>
<div
className="css-0 gf-form-select
2
__placeholder"
className="css-0 gf-form-select
-box
__placeholder"
>
Select user
</div>
...
...
@@ -25,7 +25,7 @@ exports[`UserPicker renders correctly 1`] = `
className="css-0"
>
<div
className="gf-form-select
2
__input"
className="gf-form-select
-box
__input"
style={
Object {
"display": "inline-block",
...
...
@@ -108,10 +108,10 @@ exports[`UserPicker renders correctly 1`] = `
</div>
</div>
<div
className="css-0 gf-form-select
2
__indicators"
className="css-0 gf-form-select
-box
__indicators"
>
<span
className="gf-form-select
2
__select-arrow "
className="gf-form-select
-box
__select-arrow "
/>
</div>
</div>
...
...
public/app/core/components/TagFilter/TagFilter.tsx
View file @
ffae3e7a
...
...
@@ -39,7 +39,7 @@ export class TagFilter extends React.Component<Props, any> {
render
()
{
const
selectOptions
=
{
classNamePrefix
:
'gf-form-select
2
'
,
classNamePrefix
:
'gf-form-select
-box
'
,
isMulti
:
true
,
defaultOptions
:
true
,
loadOptions
:
this
.
searchTags
,
...
...
public/app/features/explore/Explore.tsx
View file @
ffae3e7a
...
...
@@ -544,7 +544,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
{
!
datasourceMissing
?
(
<
div
className=
"navbar-buttons"
>
<
Select
classNamePrefix=
{
`gf-form-select
2
`
}
classNamePrefix=
{
`gf-form-select
-box
`
}
isMulti=
{
false
}
isLoading=
{
datasourceLoading
}
isClearable=
{
false
}
...
...
public/sass/components/_form_select_box.scss
View file @
ffae3e7a
...
...
@@ -15,7 +15,7 @@ $select-input-bg-disabled: $input-bg-disabled;
@include
box-shadow
(
$shadow
);
}
.gf-form-select
2
__control
{
.gf-form-select
-box
__control
{
@include
select-control
();
border
:
1px
solid
$input-border-color
;
color
:
$input-color
;
...
...
@@ -29,45 +29,45 @@ $select-input-bg-disabled: $input-bg-disabled;
position
:
relative
;
}
.gf-form-select
2
__control--is-focused
{
.gf-form-select
-box
__control--is-focused
{
background-color
:
$input-bg
;
@include
select-control-focus
();
}
.gf-form-select
2
__control--is-disabled
{
.gf-form-select
-box
__control--is-disabled
{
background-color
:
$select-input-bg-disabled
;
}
.gf-form-select
2
__control--menu-right
{
.gf-form-select
2
__menu
{
.gf-form-select
-box
__control--menu-right
{
.gf-form-select
-box
__menu
{
right
:
0
;
left
:
unset
;
}
}
.gf-form-select
2
__input
{
.gf-form-select
-box
__input
{
padding-left
:
5px
;
}
.gf-form-select
2
__menu
{
.gf-form-select
-box
__menu
{
background
:
$select-input-bg-disabled
;
position
:
absolute
;
z-index
:
2
;
}
.tag-filter
.gf-form-select
2
__menu
{
.tag-filter
.gf-form-select
-box
__menu
{
width
:
100%
;
}
.gf-form-select
2
__multi-value
{
.gf-form-select
-box
__multi-value
{
display
:
inline
;
}
.gf-form-select
2
__option
{
.gf-form-select
-box
__option
{
border-left
:
2px
solid
transparent
;
&
.gf-form-select
2
__option--is-focused
,
&
.gf-form-select
2
__option--is-selected
{
&
.gf-form-select
-box
__option--is-focused
,
&
.gf-form-select
-box
__option--is-selected
{
background-color
:
$dropdownLinkBackgroundHover
;
color
:
$dropdownLinkColorHover
;
@include
left-brand-border-gradient
();
...
...
@@ -77,11 +77,11 @@ $select-input-bg-disabled: $input-bg-disabled;
}
}
.gf-form-select
2__control--is-focused
.gf-form-select2
__placeholder
{
.gf-form-select
-box__control--is-focused
.gf-form-select-box
__placeholder
{
display
:
none
;
}
.gf-form-select
2
__value-container
{
.gf-form-select
-box
__value-container
{
display
:
table-cell
;
padding
:
8px
10px
;
>
div
{
...
...
@@ -89,14 +89,14 @@ $select-input-bg-disabled: $input-bg-disabled;
}
}
.gf-form-select
2
__indicators
{
.gf-form-select
-box
__indicators
{
display
:
table-cell
;
vertical-align
:
middle
;
padding-right
:
5px
;
width
:
25px
;
}
.gf-form-select
2
__select-arrow
{
.gf-form-select
-box
__select-arrow
{
border-color
:
$input-color-select-arrow
transparent
transparent
;
border-style
:
solid
;
border-width
:
5px
5px
2
.5px
;
...
...
@@ -105,7 +105,7 @@ $select-input-bg-disabled: $input-bg-disabled;
width
:
0
;
position
:
relative
;
&
.gf-form-select
2
__select-arrow--reversed
{
&
.gf-form-select
-box
__select-arrow--reversed
{
border-color
:
transparent
transparent
$input-color-select-arrow
;
top
:
-2px
;
border-width
:
0
5px
5px
;
...
...
@@ -118,7 +118,7 @@ $select-input-bg-disabled: $input-bg-disabled;
}
.gf-form--has-input-icon
{
.gf-form-select
2
__value-container
{
.gf-form-select
-box
__value-container
{
padding-left
:
30px
;
}
}
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