1
0
Fork 0

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
commit 0c5e4f2aee
4 changed files with 19 additions and 2 deletions

View File

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

View File

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

View File

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

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

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