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:
Willi Goesgens 2014-10-10 13:23:48 +02:00
parent 4af23ddfe3 75ef83e747
commit 0c5e4f2aee
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/apps/system/aardvark/frontend/js/views/collectionsItemView.js
View File

@ -79,11 +79,13 @@
{
error: function() {
arangoHelper.arangoError('Could not delete collection.');
},
success: function() {
window.modalView.hide();
}
}
);
this.collectionsView.render();
window.modalView.hide();
},
saveModifiedCollection: function() {

8
js/apps/system/aardvark/frontend/scss/_notification.scss
View File

@ -34,11 +34,19 @@
button {
@extend %pull-right;
margin-right: 5px;
margin-top: 5px;
}
.notificationItem {
color: $c-black;
.notificationItemTitle {
max-width: 165px;
overflow-wrap: break-word;
white-space: normal;
word-wrap: break-word;
}
.notificationItemTitle:hover {
color: #000;
cursor: default;

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

@ -4596,9 +4596,15 @@ pre.gv-object-view {
width: 155px;
word-wrap: break-word; }
.fixedDropdown button {
margin-right: 5px; }
margin-right: 5px;
margin-top: 5px; }
.fixedDropdown .notificationItem {
color: #000; }
.fixedDropdown .notificationItem .notificationItemTitle {
max-width: 165px;
overflow-wrap: break-word;
white-space: normal;
word-wrap: break-word; }
.fixedDropdown .notificationItem .notificationItemTitle:hover {
color: #000;
cursor: default; }

1
js/node/crypto.js Normal file
View File

@ -0,0 +1 @@
// not supported