Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Michael Hackstein 2014-04-03 09:46:44 +02:00
parent e647e5e8e1 4cebb1a752
commit 5c884282db
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/apps/system/aardvark/frontend/js/templates/modalBase.ejs
View File

@ -21,5 +21,10 @@
<button id="modalButton<%=key%>" class="button-<%=type%>" <%=disabled%>><%=title%></button> <button id="modalButton<%=key%>" class="button-<%=type%>" <%=disabled%>><%=title%></button>
<%});%> <%});%>
</div> </div>
<div class="alert alert-error modal-delete-confirmation" id="modal-delete-confirmation">
<strong>Really delete?</strong>
<button id="modal-confirm-delete" class="button-danger pull-right modal-confirm-delete">Yes</button>
<button id="modal-abort-delete" class="button-neutral pull-right">No</button>
</div>
</div> </div>
</script> </script>

13
js/apps/system/aardvark/frontend/scss/_modals.scss
View File

@ -181,3 +181,16 @@ pre.gv-object-view {
.modal-body input[type='checkbox'] { .modal-body input[type='checkbox'] {
margin-bottom: 10px; margin-bottom: 10px;
} }
.modal-delete-confirmation {
display: none;
button {
margin-top: -4px;
margin-right: 10px;
.modal-confirm-delete {
margin-right: -18px;
}
}
}

8
js/apps/system/aardvark/frontend/scss/generated.css
View File

@ -2586,6 +2586,14 @@ pre.gv-object-view {
.modal-body input[type='checkbox'] { .modal-body input[type='checkbox'] {
margin-bottom: 10px; } margin-bottom: 10px; }
.modal-delete-confirmation {
display: none; }
.modal-delete-confirmation button {
margin-top: -4px;
margin-right: 10px; }
.modal-delete-confirmation button .modal-confirm-delete {
margin-right: -18px; }
.navlogo .stat_cpu { .navlogo .stat_cpu {
height: 26px; height: 26px;
margin-top: 1px; margin-top: 1px;