revert 8bf8871, fc2aad3, 503d338.
some misplaced UI development changes
This commit is contained in:
parent
5bbc336a25
commit
1584b35e3b
|
@ -20,6 +20,3 @@ DEPENDENCIES
|
||||||
sass
|
sass
|
||||||
therubyracer
|
therubyracer
|
||||||
uglifier
|
uglifier
|
||||||
|
|
||||||
BUNDLED WITH
|
|
||||||
1.10.3
|
|
||||||
|
|
|
@ -4,7 +4,8 @@
|
||||||
"ui_dir": ".",
|
"ui_dir": ".",
|
||||||
"bootstrap": true,
|
"bootstrap": true,
|
||||||
"server": true,
|
"server": true,
|
||||||
"advertise_addr": "127.0.0.1",
|
"acl_datacenter": "dc1",
|
||||||
|
"acl_master_token": "dev",
|
||||||
"http_api_response_headers": {
|
"http_api_response_headers": {
|
||||||
"Access-Control-Allow-Origin": "*"
|
"Access-Control-Allow-Origin": "*"
|
||||||
}
|
}
|
||||||
|
|
|
@ -143,15 +143,11 @@
|
||||||
{{#link-to 'kv' class='btn btn-default col-xs-12'}}Key/Value{{/link-to}}
|
{{#link-to 'kv' class='btn btn-default col-xs-12'}}Key/Value{{/link-to}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-1 col-sm-2 col-xs-8 col-md-offset-0 col-sm-offset-2 col-xs-offset-1">
|
<div class="col-md-2 col-sm-2 col-xs-8 col-md-offset-0 col-sm-offset-2 col-xs-offset-1">
|
||||||
{{#link-to 'acls' class='btn btn-small btn-default col-xs-12'}}ACL{{/link-to}}
|
{{#link-to 'acls' class='btn btn-default col-xs-12'}}ACL{{/link-to}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-1 col-sm-2 col-xs-8 col-md-offset-0 col-sm-offset-0 col-xs-offset-1">
|
<div class="col-md-2 col-sm-2 col-xs-6 col-md-offset-0 col-sm-offset-4 col-xs-offset-1">
|
||||||
{{#link-to 'map' class='btn btn-small btn-default col-xs-12'}}Map{{/link-to}}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-md-2 col-sm-2 col-xs-6 col-md-offset-0 col-sm-offset-2 col-xs-offset-1">
|
|
||||||
<a {{bind-attr class=":col-xs-12 :btn hasFailingChecks:btn-warning:btn-success"}} {{action "toggle"}}> <span class="elip-overflow">{{model}} <span class="caret"></span></span> </a>
|
<a {{bind-attr class=":col-xs-12 :btn hasFailingChecks:btn-warning:btn-success"}} {{action "toggle"}}> <span class="elip-overflow">{{model}} <span class="caret"></span></span> </a>
|
||||||
|
|
||||||
{{#if isDropdownVisible}}
|
{{#if isDropdownVisible}}
|
||||||
|
|
|
@ -41,9 +41,6 @@ App.Router.map(function() {
|
||||||
this.route("show", { path: "/:id" });
|
this.route("show", { path: "/:id" });
|
||||||
});
|
});
|
||||||
|
|
||||||
// Map
|
|
||||||
this.resource("map", { path: "/map" });
|
|
||||||
|
|
||||||
// Shows a page explaining that ACLs haven't been set-up
|
// Shows a page explaining that ACLs haven't been set-up
|
||||||
this.route("aclsdisabled", { path: "/aclsdisabled" });
|
this.route("aclsdisabled", { path: "/aclsdisabled" });
|
||||||
// Shows a page explaining that the ACL key being used isn't
|
// Shows a page explaining that the ACL key being used isn't
|
||||||
|
|
|
@ -19,10 +19,6 @@
|
||||||
.btn {
|
.btn {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
min-width: 100px;
|
min-width: 100px;
|
||||||
|
|
||||||
&.btn-small {
|
|
||||||
min-width: 70px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-dropdown {
|
.btn-dropdown {
|
||||||
|
|
Loading…
Reference in New Issue