Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions core/js/dist/unified-search.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/unified-search.js.map

Large diffs are not rendered by default.

14 changes: 10 additions & 4 deletions core/src/components/HeaderMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,12 @@ export default {
</script>

<style lang="scss" scoped>
.notifications:not(:empty) ~ #unified-search {
order: -1;
.header-menu__carret {
right: 175px;
Copy link
Contributor

@szaimen szaimen Aug 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure that this will work?
I think it will be overwritten by the value that you've defined below as css is cascading ;)
So this should be moved to the bottom of the file, imho.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works. Css is cascading but since the rule includes an id and is more specifics it is stronger :D

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay

Copy link
Member

@skjnldsv skjnldsv Jun 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧑‍⚖️ hum, this is not a great piece of maintainable code 🙈
#32702 (comment)

}
}
.header-menu {
&__trigger {
display: flex;
Expand All @@ -184,10 +190,10 @@ export default {
}

&__wrapper {
position: absolute;
position: fixed;
z-index: 2000;
top: 50px;
right: -150px;
right: 0;
box-sizing: border-box;
margin: 0;
border-radius: 0 0 var(--border-radius) var(--border-radius);
Expand All @@ -198,7 +204,7 @@ export default {

&__carret {
position: absolute;
right: 165px;
right: 128px;
bottom: 100%;
width: 0;
height: 0;
Expand All @@ -211,7 +217,7 @@ export default {
&__content {
overflow: auto;
width: 350px;
max-width: 350px;
max-width: 100vw;
min-height: calc(44px * 1.5);
max-height: calc(100vh - 50px * 2);
}
Expand Down
2 changes: 1 addition & 1 deletion core/templates/layout.user.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
</div>

<div class="header-right">
<div id="unified-search"></div>
<div id="notifications"></div>
<div id="unified-search"></div>
<div id="contactsmenu">
<div class="icon-contacts menutoggle" tabindex="0" role="button"
aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
Expand Down