public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed form issue with firefox and IE, Closes #1551

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-03-03 20:47:35 +01:00
parent d3d39b3e17
commit 660d44b6ad
5 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/app.js
+1 -10
View File
@@ -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
+4 -4
View File
@@ -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: 246px">
<input type="text" name="username" class="tight-form-input last" required ng-model='formModel.user' placeholder="email or username" style="width: 255px">
</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: 246px" placeholder="password">
<input type="password" name="password" class="tight-form-input last" required ng-model="formModel.password" id="inputPassword" style="width: 255px" 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: 246px">
<input type="email" class="tight-form-input last" required ng-model='formModel.email' placeholder="email" style="width: 255px">
</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: 246px">
<input type="password" class="tight-form-input last" watch-change="passwordChanged(inputValue)" ng-minlength="4" required ng-model='formModel.password' placeholder="password" style="width: 255px">
</li>
</ul>
<div class="clearfix"></div>
src/css/less/tightform.less
+2 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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: