Merge pull request #237 from nextcloud/issue-231-call-menu-broken

Fix broken call menu
This commit is contained in:
Ivan Sein 2017-02-13 16:45:49 +01:00 коммит произвёл GitHub
Родитель 14bf11232b ebd43863a2
Коммит 71d332b7a3
2 изменённых файлов: 15 добавлений и 5 удалений

Просмотреть файл

@ -58,6 +58,10 @@
padding: 0; padding: 0;
} }
.app-navigation-entry-menu li {
display: block !important;
}
#app-navigation .avatar, #app-navigation .avatar,
#app-navigation .icon-contacts-dark, #app-navigation .icon-contacts-dark,
#app-navigation .app-navigation-entry-link .icon-public { #app-navigation .app-navigation-entry-link .icon-public {
@ -107,7 +111,7 @@
background-size: 16px; background-size: 16px;
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 4px;
padding: 16px; padding: 16px;
opacity: .5; opacity: .5;
} }
@ -122,16 +126,19 @@
background-color: transparent; background-color: transparent;
border: none; border: none;
position: absolute; position: absolute;
right: -5px; right: -2px;
top: 38px; top: 42px;
padding: 16px; padding: 16px;
opacity: .5; opacity: .5;
} }
.icon-confirm.rename-confirm:hover { .icon-confirm.rename-confirm:hover {
opacity: 1; opacity: 1;
} }
.icon-clippy.public-room {
background-position-y: 8px !important;
}
#videos { #videos {
position: absolute; position: absolute;
@ -399,12 +406,14 @@ video {
margin: 0; margin: 0;
padding: 0; padding: 0;
width: 100% !important; width: 100% !important;
min-height: 44px;
} }
#app-navigation .app-navigation-entry-menu input { #app-navigation .app-navigation-entry-menu input {
margin-left: 5px !important; margin-left: 5px !important;
margin-top: -5px; margin-top: -5px;
padding-right: 22px; min-width: 150px;
padding-right: 26px;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }

Просмотреть файл

@ -208,6 +208,7 @@
} }
this.$el.find('.rename-input').focus(); this.$el.find('.rename-input').focus();
this.$el.find('.rename-input').select();
this.$el.keyup(function(e) { this.$el.keyup(function(e) {
if (e.keyCode === 13) { if (e.keyCode === 13) {
self.confirmRoomRename(); self.confirmRoomRename();