Commit 660d44b6 by Torkel Ödegaard

Fixed form issue with firefox and IE, Closes #1551

parent d3d39b3e
...@@ -67,16 +67,7 @@ function (angular, $, _, appLevelRequire) { ...@@ -67,16 +67,7 @@ function (angular, $, _, appLevelRequire) {
'pasvaz.bindonce' 'pasvaz.bindonce'
]; ];
var module_types = ['controllers', 'directives', 'factories', 'services', 'filters']; var module_types = ['controllers', 'directives', 'factories', 'services', 'filters', 'routes'];
if (window.grafanaBackend) {
module_types.push('routes');
angular.module('grafana.routes.standalone', []);
}
else {
module_types.push('routes.standalone');
angular.module('grafana.routes', []);
}
_.each(module_types, function (type) { _.each(module_types, function (type) {
var module_name = 'grafana.'+type; var module_name = 'grafana.'+type;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<strong>User</strong> <strong>User</strong>
</li> </li>
<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> </li>
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<strong>Password</strong> <strong>Password</strong>
</li> </li>
<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> </li>
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<strong>Email</strong> <strong>Email</strong>
</li> </li>
<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> </li>
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<strong>Password</strong> <strong>Password</strong>
</li> </li>
<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> </li>
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
......
...@@ -151,7 +151,8 @@ input[type=text].tight-form-clear-input { ...@@ -151,7 +151,8 @@ input[type=text].tight-form-clear-input {
border-right: 1px solid @grafanaTargetSegmentBorder; border-right: 1px solid @grafanaTargetSegmentBorder;
margin: 0px; margin: 0px;
border-radius: 0; border-radius: 0;
padding: 18px 6px; padding: 8px 6px;
height: 100%;
box-sizing: border-box; box-sizing: border-box;
&.last { &.last {
border-right: none; border-right: none;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<!-- build:js app/app.js --> <!-- build:js app/app.js -->
<script src="[[.AppSubUrl]]/public/vendor/require/require.js"></script> <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 --> <!-- endbuild -->
</head> </head>
......
...@@ -34,7 +34,7 @@ build: ...@@ -34,7 +34,7 @@ build:
- script: - script:
name: copy output name: copy output
code: |- 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" rsync -rv "$WERCKER_SOURCE_DIR/dist/" "$WERCKER_OUTPUT_DIR"
- s3sync: - s3sync:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment