mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10608 from nextcloud/header-menu-fixes 

Fix header menu & contact popover
This commit is contained in:
Julius Härtl 2018-08-16 09:50:25 +02:00 committed by GitHub
parent a4e042c706 846b8572ed
commit d79943f498
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/css/apps.scss
View File

@ -879,6 +879,10 @@ $popovericon-size: 16px;
display: block; display: block;
} }
&.contactsmenu-popover {
margin: 0;
}
ul { ul {
/* Overwrite #app-navigation > ul ul */ /* Overwrite #app-navigation > ul ul */
display: flex !important; display: flex !important;

3
core/css/header.scss
View File

@ -70,7 +70,8 @@
#header { #header {
/* Header menu */ /* Header menu */
.menu { .header-left > nav > .menu,
.header-right > div > .menu {
background-color: var(--color-main-background); background-color: var(--color-main-background);
filter: drop-shadow(0 1px 5px var(--color-box-shadow)); filter: drop-shadow(0 1px 5px var(--color-box-shadow));
border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px;

2
core/js/jquery.contactsmenu.js
View File

@ -15,7 +15,7 @@
+ '</li>'; + '</li>';
var LIST = '' var LIST = ''
+ '<div class="menu popovermenu bubble hidden contactsmenu-popover">' + '<div class="menu popovermenu menu-left hidden contactsmenu-popover">'
+ ' <ul>' + ' <ul>'
+ ' <li>' + ' <li>'
+ ' <a>' + ' <a>'

12
core/js/tests/specs/jquery.contactsmenuSpec.js
View File

@ -45,7 +45,7 @@ describe('jquery.contactsMenu tests', function() {
it('append list if shareType supported', function() { it('append list if shareType supported', function() {
$selector1.contactsMenu('user', 0, $appendTo); $selector1.contactsMenu('user', 0, $appendTo);
expect($appendTo.children().length).toEqual(1); expect($appendTo.children().length).toEqual(1);
expect($appendTo.html()).toEqual('<div class="menu popovermenu bubble hidden contactsmenu-popover"> <ul> <li> <a> <span class="icon-loading-small"></span> </a> </li> </ul></div>'); expect($appendTo.html()).toEqual('<div class="menu popovermenu menu-left hidden contactsmenu-popover"> <ul> <li> <a> <span class="icon-loading-small"></span> </a> </li> </ul></div>');
}); });
}); });
@ -120,7 +120,7 @@ describe('jquery.contactsMenu tests', function() {
expect(fakeServer.requests[0].method).toEqual('POST'); expect(fakeServer.requests[0].method).toEqual('POST');
expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne'); expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne');
expect($appendTo.html()).toEqual('<div class="menu popovermenu bubble contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="mailto:bar%40baz.wtf"> <img src="foo.svg"> <span>bar@baz.wtf</span> </a></li></ul></div>'); expect($appendTo.html()).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="mailto:bar%40baz.wtf"> <img src="foo.svg"> <span>bar@baz.wtf</span> </a></li></ul></div>');
}); });
it('load topaction and more actions', function() { it('load topaction and more actions', function() {
@ -147,7 +147,7 @@ describe('jquery.contactsMenu tests', function() {
expect(fakeServer.requests[0].method).toEqual('POST'); expect(fakeServer.requests[0].method).toEqual('POST');
expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne'); expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne');
expect($appendTo.html()).toEqual('<div class="menu popovermenu bubble contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="mailto:bar%40baz.wtf"> <img src="foo.svg"> <span>bar@baz.wtf</span> </a></li><li> <a href="http://localhost/index.php/apps/contacts"> <img src="details.svg"> <span>Details</span> </a></li></ul></div>'); expect($appendTo.html()).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="mailto:bar%40baz.wtf"> <img src="foo.svg"> <span>bar@baz.wtf</span> </a></li><li> <a href="http://localhost/index.php/apps/contacts"> <img src="details.svg"> <span>Details</span> </a></li></ul></div>');
}); });
it('load no actions', function() { it('load no actions', function() {
@ -167,7 +167,7 @@ describe('jquery.contactsMenu tests', function() {
expect(fakeServer.requests[0].method).toEqual('POST'); expect(fakeServer.requests[0].method).toEqual('POST');
expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne'); expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne');
expect($appendTo.html()).toEqual('<div class="menu popovermenu bubble contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="#"> <span>No action available</span> </a></li></ul></div>'); expect($appendTo.html()).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="#"> <span>No action available</span> </a></li></ul></div>');
}); });
it('should throw an error', function() { it('should throw an error', function() {
@ -182,7 +182,7 @@ describe('jquery.contactsMenu tests', function() {
expect(fakeServer.requests[0].method).toEqual('POST'); expect(fakeServer.requests[0].method).toEqual('POST');
expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne'); expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne');
expect($appendTo.html()).toEqual('<div class="menu popovermenu bubble contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="#"> <span>Error fetching contact actions</span> </a></li></ul></div>'); expect($appendTo.html()).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="#"> <span>Error fetching contact actions</span> </a></li></ul></div>');
}); });
it('should handle 404', function() { it('should handle 404', function() {
@ -197,7 +197,7 @@ describe('jquery.contactsMenu tests', function() {
expect(fakeServer.requests[0].method).toEqual('POST'); expect(fakeServer.requests[0].method).toEqual('POST');
expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne'); expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne');
expect($appendTo.html()).toEqual('<div class="menu popovermenu bubble contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="#"> <span>No action available</span> </a></li></ul></div>'); expect($appendTo.html()).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded" style="display: block;"> <ul> <li class="hidden"> <a> <span class="icon-loading-small"></span> </a> </li> <li> <a href="#"> <span>No action available</span> </a></li></ul></div>');
}); });
}); });