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
660d44b6
Commit
660d44b6
authored
Mar 03, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed form issue with firefox and IE, Closes #1551
parent
d3d39b3e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
17 deletions
+9
-17
src/app/app.js
+1
-10
src/app/partials/login.html
+4
-4
src/css/less/tightform.less
+2
-1
src/views/index.html
+1
-1
wercker.yml
+1
-1
No files found.
src/app/app.js
View file @
660d44b6
...
...
@@ -67,16 +67,7 @@ function (angular, $, _, appLevelRequire) {
'pasvaz.bindonce'
];
var
module_types
=
[
'controllers'
,
'directives'
,
'factories'
,
'services'
,
'filters'
];
if
(
window
.
grafanaBackend
)
{
module_types
.
push
(
'routes'
);
angular
.
module
(
'grafana.routes.standalone'
,
[]);
}
else
{
module_types
.
push
(
'routes.standalone'
);
angular
.
module
(
'grafana.routes'
,
[]);
}
var
module_types
=
[
'controllers'
,
'directives'
,
'factories'
,
'services'
,
'filters'
,
'routes'
];
_
.
each
(
module_types
,
function
(
type
)
{
var
module_name
=
'grafana.'
+
type
;
...
...
src/app/partials/login.html
View file @
660d44b6
...
...
@@ -23,7 +23,7 @@
<strong>
User
</strong>
</li>
<li>
<input
type=
"text"
name=
"username"
class=
"tight-form-input last"
required
ng-model=
'formModel.user'
placeholder=
"email or username"
style=
"width: 2
46
px"
>
<input
type=
"text"
name=
"username"
class=
"tight-form-input last"
required
ng-model=
'formModel.user'
placeholder=
"email or username"
style=
"width: 2
55
px"
>
</li>
</ul>
<div
class=
"clearfix"
></div>
...
...
@@ -34,7 +34,7 @@
<strong>
Password
</strong>
</li>
<li>
<input
type=
"password"
name=
"password"
class=
"tight-form-input last"
required
ng-model=
"formModel.password"
id=
"inputPassword"
style=
"width: 2
46
px"
placeholder=
"password"
>
<input
type=
"password"
name=
"password"
class=
"tight-form-input last"
required
ng-model=
"formModel.password"
id=
"inputPassword"
style=
"width: 2
55
px"
placeholder=
"password"
>
</li>
</ul>
<div
class=
"clearfix"
></div>
...
...
@@ -46,7 +46,7 @@
<strong>
Email
</strong>
</li>
<li>
<input
type=
"email"
class=
"tight-form-input last"
required
ng-model=
'formModel.email'
placeholder=
"email"
style=
"width: 2
46
px"
>
<input
type=
"email"
class=
"tight-form-input last"
required
ng-model=
'formModel.email'
placeholder=
"email"
style=
"width: 2
55
px"
>
</li>
</ul>
<div
class=
"clearfix"
></div>
...
...
@@ -58,7 +58,7 @@
<strong>
Password
</strong>
</li>
<li>
<input
type=
"password"
class=
"tight-form-input last"
watch-change=
"passwordChanged(inputValue)"
ng-minlength=
"4"
required
ng-model=
'formModel.password'
placeholder=
"password"
style=
"width: 2
46
px"
>
<input
type=
"password"
class=
"tight-form-input last"
watch-change=
"passwordChanged(inputValue)"
ng-minlength=
"4"
required
ng-model=
'formModel.password'
placeholder=
"password"
style=
"width: 2
55
px"
>
</li>
</ul>
<div
class=
"clearfix"
></div>
...
...
src/css/less/tightform.less
View file @
660d44b6
...
...
@@ -151,7 +151,8 @@ input[type=text].tight-form-clear-input {
border-right: 1px solid @grafanaTargetSegmentBorder;
margin: 0px;
border-radius: 0;
padding: 18px 6px;
padding: 8px 6px;
height: 100%;
box-sizing: border-box;
&.last {
border-right: none;
...
...
src/views/index.html
View file @
660d44b6
...
...
@@ -22,7 +22,7 @@
<!-- build:js app/app.js -->
<script
src=
"[[.AppSubUrl]]/public/vendor/require/require.js"
></script>
<script
src=
"[[.AppSubUrl]]/public/app/components/require.
backend
.js"
></script>
<script
src=
"[[.AppSubUrl]]/public/app/components/require.
config
.js"
></script>
<!-- endbuild -->
</head>
...
...
wercker.yml
View file @
660d44b6
...
...
@@ -34,7 +34,7 @@ build:
-
script
:
name
:
copy output
code
:
|-
cp
$WERCKER_SOURCE_DIR/dist $WERCKER_ROOT
cp
-r $WERCKER_SOURCE_DIR/dist/ $WERCKER_ROOT/
rsync -rv "$WERCKER_SOURCE_DIR/dist/" "$WERCKER_OUTPUT_DIR"
-
s3sync
:
...
...
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