Skip to content

Fix position of search bar - #28660

Merged
CarlSchwan merged 1 commit into
masterfrom
work/carl/fix-search-position
Aug 31, 2021
Merged

Fix position of search bar#28660
CarlSchwan merged 1 commit into
masterfrom
work/carl/fix-search-position

Conversation

@CarlSchwan

@CarlSchwanCarlSchwan commented Aug 31, 2021•
edited by szaimen
Loading

Copy link
Copy Markdown
Member

Fix#28584
Close#28585

New:

image
image

Before:

image
image

Signed-off-by: Carl Schwan carl@carlschwan.eu

@CarlSchwan
CarlSchwan requested review from a team, jancborchardt, julien-nc, juliusknorr and szaimen and removed request for a teamAugust 31, 2021 11:34
@CarlSchwanCarlSchwan added the 3. to review Waiting for reviews label Aug 31, 2021
@szaimen

szaimen commented Aug 31, 2021

Copy link
Copy Markdown
Contributor

@CarlSchwan Can you please show screenshot of this when the notifications app is enabled?
I tried to fix this too in #28585 btw ;)

@szaimenszaimen mentioned this pull request Aug 31, 2021
Closed
@CarlSchwan
CarlSchwanforce-pushed the work/carl/fix-search-position branch 2 times, most recently from d444241 to 2f45ac9CompareAugust 31, 2021 12:52
@CarlSchwan

CarlSchwan commented Aug 31, 2021

Copy link
Copy Markdown
MemberAuthor

@CarlSchwan Can you please show screenshot of this when the notifications app is enabled?
I tried to fix this too in #28585 btw ;)

I didn't know you were already working on it :(

I figured a hacky way to make it work: using a CSS detection that the notifications element is not empty we can push the carret a bit more to the left.

Here is a screenshot with the notification stuff enabled

image

szaimen
szaimen approved these changes Aug 31, 2021
View reviewed changes

@szaimenszaimen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Fine by me unless anyone finds a better way (less hacky) e.g. like suggested here:
#28585 (comment)

Comment threadcore/src/components/HeaderMenu.vue
.notifications:not(:empty) ~ #unified-search {
order: -1;
.header-menu__carret {
right: 175px;

@szaimenszaimenAug 31, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

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.

@CarlSchwanCarlSchwanAug 31, 2021

Copy link
Copy Markdown
MemberAuthor

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

@szaimenszaimenAug 31, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Okay

@skjnldsvskjnldsvJun 2, 2022•
edited
Loading

Copy link
Copy Markdown
Member

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)

szaimen
szaimen reviewed Aug 31, 2021
View reviewed changes
Comment threadcore/templates/layout.user.php
@kesselb

kesselb commented Aug 31, 2021

Copy link
Copy Markdown
Contributor

Hey @488849, thank you for reviewing this pull request. Approving once is enough. We take care of the rest 🤞

@szaimenszaimen added this to the Nextcloud 23 milestone Aug 31, 2021
@szaimen

szaimen commented Aug 31, 2021

Copy link
Copy Markdown
Contributor

/backport to stable22

@szaimen

szaimen commented Aug 31, 2021

Copy link
Copy Markdown
Contributor

/backport to stable21

@szaimen

szaimen commented Aug 31, 2021

Copy link
Copy Markdown
Contributor

/backport to stable20

Pytal
Pytal approved these changes Aug 31, 2021
View reviewed changes

@PytalPytal left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just slightly hacky 😂

@Pytal

Pytal commented Aug 31, 2021

Copy link
Copy Markdown
Member

/compile amend /

@nextcloud-command
nextcloud-commandforce-pushed the work/carl/fix-search-position branch from 2f45ac9 to 565cf69CompareAugust 31, 2021 14:29
@szaimen

szaimen commented Aug 31, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

Why are there suddenly conflicts after compiling? The compiled files didn't change in master since creating this branch, afaik.

Could maybe this be the reason?

server/.github/workflows/command-compile.yml

Line 79 in 4411822

cache: npm

Cc @skjnldsv

@CarlSchwan
CarlSchwanforce-pushed the work/carl/fix-search-position branch from 565cf69 to c4c5bddCompareAugust 31, 2021 15:05
@CarlSchwan

CarlSchwan commented Aug 31, 2021

Copy link
Copy Markdown
MemberAuthor

/compile amend /

@CarlSchwan

CarlSchwan commented Aug 31, 2021

Copy link
Copy Markdown
MemberAuthor

Why are there suddenly conflicts after compiling? The compiled files didn't change in master since creating this branch, afaik.

Could maybe this be the reason?

server/.github/workflows/command-compile.yml

Line 79 in 4411822

cache: npm

Cc @skjnldsv

I just rebased and let the compile bot generate the assets again, let see...

@CarlSchwan@nextcloud-command
Fix position of search bar
4027bba
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@nextcloud-command
nextcloud-commandforce-pushed the work/carl/fix-search-position branch from c4c5bdd to 4027bbaCompareAugust 31, 2021 15:12
@szaimen

szaimen commented Aug 31, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

I just rebased and let the compile bot generate the assets again, let see...

Seems to work now but still strange...

@szaimenszaimen added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 31, 2021
@CarlSchwan

CarlSchwan commented Aug 31, 2021

Copy link
Copy Markdown
MemberAuthor

ci seems stuck but also unrelated to this PR:

[1630425618.218][SEVERE]: bind() failed: Cannot assign requested address (99)
ChromeDriver was started successfully.

@CarlSchwan
CarlSchwan merged commit 734a750 into masterAug 31, 2021
@CarlSchwan
CarlSchwan deleted the work/carl/fix-search-position branch August 31, 2021 16:26
@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Aug 31, 2021
Merged
@nextcloudnextcloud deleted a comment Aug 31, 2021
@nextcloudnextcloud deleted a comment Aug 31, 2021
@nextcloudnextcloud deleted a comment Aug 31, 2021
@nextcloudnextcloud deleted a comment Aug 31, 2021
@nextcloudnextcloud deleted a comment Aug 31, 2021
@szaimen

szaimen commented Aug 31, 2021

Copy link
Copy Markdown
Contributor

/backport to stable21

@szaimen

szaimen commented Aug 31, 2021

Copy link
Copy Markdown
Contributor

/backport to stable20

This was referenced Aug 31, 2021
Merged
Merged
@skjnldsvskjnldsv mentioned this pull request Jun 2, 2022
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@szaimenszaimenszaimen approved these changes
@PytalPytalPytal approved these changes
@jancborchardtjancborchardtAwaiting requested review from jancborchardt
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr
@julien-ncjulien-ncAwaiting requested review from julien-nc
@skjnldsvskjnldsvAwaiting requested review from skjnldsv
@artongeartongeAwaiting requested review from artonge

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finish

Projects

None yet

Milestone

Nextcloud 23

Development

Successfully merging this pull request may close these issues.

NC 22.1.0 - Search modal

5 participants

@CarlSchwan@szaimen@kesselb@Pytal@skjnldsv