Fixed form issue with firefox and IE, Closes #1551

pull/1555/head
Torkel Ödegaard 10 years ago
parent d3d39b3e17
commit 660d44b6ad
  1. 11
      src/app/app.js
  2. 8
      src/app/partials/login.html
  3. 3
      src/css/less/tightform.less
  4. 2
      src/views/index.html
  5. 2
      wercker.yml

@ -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;

@ -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>

@ -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;

@ -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>

@ -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:

Loading…
Cancel
Save