diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/header.scss | 4 | ||||
| -rw-r--r-- | core/js/tests/specHelper.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index 2f0c1522b0b..cd87a34ece8 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -399,7 +399,6 @@ nav { /* Profile picture in header */ .avatardiv { - margin-right: 8px; cursor: pointer; height: 32px; width: 32px; @@ -458,9 +457,6 @@ nav { .avatardiv.avatardiv-shown + #expandDisplayName { display: none; } - #expand { - display: block; - } } #appmenu { diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js index f9bdeae0d64..7897a2f2842 100644 --- a/core/js/tests/specHelper.js +++ b/core/js/tests/specHelper.js @@ -177,6 +177,10 @@ window.isPhantom = /phantom/i.test(navigator.userAgent); delete($.fn.select2); ajaxErrorStub.restore(); + + // reset pop state handlers + OC.Util.History._handlers = []; + }); })(); |