Skip to content

Add styles for #33741. Remove boards and add underlines.#35545

Merged
ChristophWurst merged 1 commit intomasterfrom
enh/enh-fix-styles-for-33741-Focused_item_overlaps_neighbor_elements_with_text_and_border
Dec 20, 2022
Merged

Add styles for #33741. Remove boards and add underlines.#35545
ChristophWurst merged 1 commit intomasterfrom
enh/enh-fix-styles-for-33741-Focused_item_overlaps_neighbor_elements_with_text_and_border

Conversation

@JuliaKirschenheuter
Copy link
Contributor

@JuliaKirschenheuter JuliaKirschenheuter commented Dec 1, 2022 •
edited by ChristophWurst
Loading

Summary

TODO

Checklist

@JuliaKirschenheuter JuliaKirschenheuter self-assigned this Dec 1, 2022
@JuliaKirschenheuter JuliaKirschenheuter added the 3. to review Waiting for reviews label Dec 1, 2022
@JuliaKirschenheuter
Copy link
Contributor Author

JuliaKirschenheuter commented Dec 1, 2022

/backport to stable25

@szaimen
Copy link
Contributor

szaimen commented Dec 1, 2022

node is failing...

@szaimen
Copy link
Contributor

szaimen commented Dec 1, 2022

/compile /

@szaimen
Copy link
Contributor

szaimen commented Dec 1, 2022

@JuliaKirschenheuter looking at what the compile bot did did you forget to apply your changes to server.scss?

@JuliaKirschenheuter
Copy link
Contributor Author

JuliaKirschenheuter commented Dec 2, 2022 •
edited
Loading

looking at what the compile bot did did you forget to apply your changes to server.scss?

I think i haven't forgotten, but in some point after local rebasing i've lost them. I will check it carefully in a future.

@ChristophWurst
Copy link
Member

ChristophWurst commented Dec 2, 2022

@JuliaKirschenheuter see https://github.com/nextcloud/server/pull/35545/files

@ChristophWurst
Copy link
Member

ChristophWurst commented Dec 2, 2022

You have to make your changes on the source .scss files. The .css is the output.

See the https://github.com/nextcloud/server/blob/master/core/css/server.scss for the included styles. One of those includes will have the rules you adjusted.

szaimen
szaimen previously requested changes Dec 2, 2022
View reviewed changes
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

Blocking:

You have to make your changes on the source .scss files. The .css is the output.

@ChristophWurst ChristophWurst added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Dec 2, 2022
@ChristophWurst ChristophWurst marked this pull request as draft December 2, 2022 08:06
@JuliaKirschenheuter JuliaKirschenheuter force-pushed the enh/enh-fix-styles-for-33741-Focused_item_overlaps_neighbor_elements_with_text_and_border branch from 3b98142 to 434f4ac Compare December 5, 2022 11:09
@JuliaKirschenheuter JuliaKirschenheuter marked this pull request as ready for review December 5, 2022 11:10
@szaimen
Copy link
Contributor

szaimen commented Dec 5, 2022

@JuliaKirschenheuter can you try to add your logic into the block above? It looks like this is now dublicating a lot of the logic...

@JuliaKirschenheuter JuliaKirschenheuter force-pushed the enh/enh-fix-styles-for-33741-Focused_item_overlaps_neighbor_elements_with_text_and_border branch from 434f4ac to 35a75ed Compare December 5, 2022 13:30
@JuliaKirschenheuter JuliaKirschenheuter force-pushed the enh/enh-fix-styles-for-33741-Focused_item_overlaps_neighbor_elements_with_text_and_border branch from 35a75ed to e4cb7b6 Compare December 5, 2022 13:31
@JuliaKirschenheuter JuliaKirschenheuter marked this pull request as draft December 5, 2022 13:40
@JuliaKirschenheuter JuliaKirschenheuter force-pushed the enh/enh-fix-styles-for-33741-Focused_item_overlaps_neighbor_elements_with_text_and_border branch from e4cb7b6 to a7d8763 Compare December 5, 2022 14:41
@JuliaKirschenheuter JuliaKirschenheuter marked this pull request as ready for review December 5, 2022 14:42
@JuliaKirschenheuter
Copy link
Contributor Author

JuliaKirschenheuter commented Dec 7, 2022

/compile amend /

@nextcloud-command nextcloud-command force-pushed the enh/enh-fix-styles-for-33741-Focused_item_overlaps_neighbor_elements_with_text_and_border branch from a7d8763 to b726717 Compare December 7, 2022 07:49
@JuliaKirschenheuter JuliaKirschenheuter force-pushed the enh/enh-fix-styles-for-33741-Focused_item_overlaps_neighbor_elements_with_text_and_border branch from b726717 to 9d0e613 Compare December 8, 2022 08:58
@JuliaKirschenheuter
Copy link
Contributor Author

JuliaKirschenheuter commented Dec 13, 2022

/compile amend /

@nextcloud-command nextcloud-command force-pushed the enh/enh-fix-styles-for-33741-Focused_item_overlaps_neighbor_elements_with_text_and_border branch from 78a7480 to e021061 Compare December 13, 2022 12:45
ChristophWurst
ChristophWurst reviewed Dec 13, 2022
View reviewed changes
@JuliaKirschenheuter JuliaKirschenheuter force-pushed the enh/enh-fix-styles-for-33741-Focused_item_overlaps_neighbor_elements_with_text_and_border branch from e021061 to 7034602 Compare December 13, 2022 13:56
ChristophWurst
ChristophWurst approved these changes Dec 13, 2022
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

Code looks 👍

@ChristophWurst ChristophWurst added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Dec 13, 2022
@ChristophWurst ChristophWurst mentioned this pull request Dec 14, 2022
Merged
1 task
@JuliaKirschenheuter JuliaKirschenheuter added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 16, 2022
@PVince81 PVince81 requested a review from szaimen December 16, 2022 15:48
@JuliaKirschenheuter @ChristophWurst
Change focused items behavior that neighbor elements (text and border…
4432069 
…) have no overlapping.

Add native tooltips to items.

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@ChristophWurst ChristophWurst force-pushed the enh/enh-fix-styles-for-33741-Focused_item_overlaps_neighbor_elements_with_text_and_border branch from 7034602 to 4432069 Compare December 20, 2022 09:21
@szaimen szaimen dismissed their stale review December 20, 2022 09:24

resvoled

@ChristophWurst ChristophWurst merged commit 8aca99c into master Dec 20, 2022
@ChristophWurst ChristophWurst deleted the enh/enh-fix-styles-for-33741-Focused_item_overlaps_neighbor_elements_with_text_and_border branch December 20, 2022 09:59
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Dec 20, 2022
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@Pytal Pytal Pytal approved these changes

@PVince81 PVince81 Awaiting requested review from PVince81

@szaimen szaimen Awaiting requested review from szaimen

Assignees

@JuliaKirschenheuter JuliaKirschenheuter

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[BITV] Focused item overlaps neighbor elements with text and border

4 participants

@JuliaKirschenheuter @szaimen @ChristophWurst @Pytal