Fix add credential, NAV colors

This commit is contained in:
Vincent Fiduccia 2015-03-25 16:42:15 -07:00
parent 4248dedebf
commit 70ebff0cc1
5 changed files with 10 additions and 10 deletions

View File

@ -57,6 +57,11 @@ The built-in cattle server expects to be run from `/static/` and hosted on a CDN
* `ember test`
* `ember test --server`
### Bugs & Issues
Please submit bugs and issues to [rancherio/rancher](//github.com/rancherio/rancher/issues) with a title starting with `[UI] `.
Or just [click here](//github.com/rancherio/rancher/issues/new?title=%5BUI%5D%20) to create a new issue.
#### Useful links

View File

@ -4,6 +4,6 @@ export default Cattle.TransitioningResource.extend({
type: 'registryCredential',
name: '',
publicValue: '',
privateValue: '',
secretValue: '',
email: ''
});

View File

@ -6,7 +6,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
var cred = this.get('store').createRecord({
type:'registryCredential',
publicValue: '',
privateValue: '',
secretValue: '',
email: '',
});

View File

@ -17,11 +17,11 @@
</div>
<div class="form-group">
<label for="privateValue">Password</label>
<label for="secretValue">Password</label>
{{#if editing}}
<div class="form-control-static">{{serverAddress}}</div>
{{else}}
{{input id="privateValue" type="password" value=privateValue classNames="form-control" placeholder="e.g. mypassword"}}
{{input id="secretValue" type="password" value=secretValue classNames="form-control" placeholder="e.g. mypassword"}}
{{/if}}
</div>

View File

@ -199,7 +199,7 @@ MAIN {
}
BODY.white MAIN {
margin-top: $main-padding;
margin-top: $main-padding/2;
margin-right: $main-padding;
margin-bottom: $main-padding;
margin-left: $nav-width + $main-padding;
@ -361,31 +361,26 @@ $nav-5: #66b0cb;
.nav-hosts {
border-left-color: $nav-1;
border-bottom-color: $nav-1;
&.active { background-color: $nav-1; }
}
.nav-containers {
border-left-color: $nav-2;
border-bottom-color: $nav-2;
&.active { background-color: $nav-2; }
}
.nav-volumes {
border-left-color: $nav-3;
border-bottom-color: $nav-3;
&.active { background-color: $nav-3; }
}
.nav-registries {
border-left-color: $nav-4;
border-bottom-color: $nav-4;
&.active { background-color: $nav-4; }
}
.nav-api {
border-left-color: $nav-5;
border-bottom-color: $nav-5;
&.active { background-color: $nav-5; }
}