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
262a0366
Commit
262a0366
authored
Feb 15, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux(): updated some forms with the new flexbox based classes
parent
422decde
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
16 deletions
+11
-16
public/app/features/datasources/partials/http_settings.html
+1
-1
public/app/features/profile/partials/profile.html
+7
-13
public/sass/components/_gf-form.scss
+3
-2
No files found.
public/app/features/datasources/partials/http_settings.html
View file @
262a0366
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
</div>
</div>
<div
class=
"gf-form"
>
<div
class=
"gf-form"
>
<span
class=
"gf-form-label gf-size-
sx
"
>
<span
class=
"gf-form-label gf-size-
xs
"
>
Access
<tip>
Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request
</tip>
Access
<tip>
Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request
</tip>
</span>
</span>
<select
class=
"gf-form-input gf-size-auto"
ng-model=
"current.access"
ng-options=
"f for f in ['direct', 'proxy']"
></select>
<select
class=
"gf-form-input gf-size-auto"
ng-model=
"current.access"
ng-options=
"f for f in ['direct', 'proxy']"
></select>
...
...
public/app/features/profile/partials/profile.html
View file @
262a0366
...
@@ -10,25 +10,19 @@
...
@@ -10,25 +10,19 @@
<h3>
Preferences
</h3>
<h3>
Preferences
</h3>
<div
class=
"gf-form"
>
<div
class=
"gf-form"
>
<span
class=
"gf-form-label gf-size-s"
>
Name
</span>
<span
class=
"gf-form-label gf-size-
x
s"
>
Name
</span>
<input
class=
"gf-form-input gf-size-xxl"
type=
"text"
required
ng-model=
"user.name"
>
<input
class=
"gf-form-input gf-size-
max-
xxl"
type=
"text"
required
ng-model=
"user.name"
>
</div>
</div>
<br>
<div
class=
"gf-form"
>
<div
class=
"gf-form"
>
<span
class=
"gf-form-label gf-size-s"
>
Email
</span>
<span
class=
"gf-form-label gf-size-
x
s"
>
Email
</span>
<input
class=
"gf-form-input gf-size-xxl"
type=
"email"
required
ng-model=
"user.email"
>
<input
class=
"gf-form-input gf-size-
max-
xxl"
type=
"email"
required
ng-model=
"user.email"
>
</div>
</div>
<br>
<div
class=
"gf-form"
>
<div
class=
"gf-form"
>
<span
class=
"gf-form-label gf-size-s"
>
Username
</span>
<span
class=
"gf-form-label gf-size-
x
s"
>
Username
</span>
<input
class=
"gf-form-input gf-size-xxl"
type=
"text"
required
ng-model=
"user.login"
>
<input
class=
"gf-form-input gf-size-
max-
xxl"
type=
"text"
required
ng-model=
"user.login"
>
</div>
</div>
<br>
<div
class=
"gf-form"
>
<div
class=
"gf-form"
>
<span
class=
"gf-form-label gf-size-s"
>
UI Theme
</span>
<span
class=
"gf-form-label gf-size-
x
s"
>
UI Theme
</span>
<select
class=
"gf-form-input gf-size-auto"
ng-model=
"user.theme"
ng-options=
"f for f in ['dark', 'light']"
></select>
<select
class=
"gf-form-input gf-size-auto"
ng-model=
"user.theme"
ng-options=
"f for f in ['dark', 'light']"
></select>
</div>
</div>
...
...
public/sass/components/_gf-form.scss
View file @
262a0366
...
@@ -67,6 +67,7 @@ $gf-form-margin: 4px;
...
@@ -67,6 +67,7 @@ $gf-form-margin: 4px;
width
:
100%
;
width
:
100%
;
margin-right
:
$gf-form-margin
;
margin-right
:
$gf-form-margin
;
}
}
&
.gf-size-auto
{
width
:
auto
;
}
}
}
input
[
type
=
checkbox
]
.gf-form-checkbox
{
input
[
type
=
checkbox
]
.gf-form-checkbox
{
...
@@ -80,6 +81,7 @@ select.gf-form-input {
...
@@ -80,6 +81,7 @@ select.gf-form-input {
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
margin-right
:
$gf-form-margin
;
margin-right
:
$gf-form-margin
;
&
.gf-size-auto
{
width
:
auto
;
}
}
}
@each
$size
,
$value
in
$form-sizes
{
@each
$size
,
$value
in
$form-sizes
{
...
@@ -90,7 +92,6 @@ select.gf-form-input {
...
@@ -90,7 +92,6 @@ select.gf-form-input {
}
}
}
}
.gf-size-auto
{
width
:
auto
;
}
.gf-size-max
{
width
:
100%
;
}
.gf-size-max
{
width
:
100%
;
}
.gf-size-auto
{
width
:
auto
;
}
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