Skip to content

Commit 9f654c7

Browse files
authored
Merge pull request #61849 from nextcloud/feat/search-combobox-shell
feat(core): header-anchored combobox shell for unified search
2 parents dc0aa50 + a357887 commit 9f654c7

60 files changed

Lines changed: 904 additions & 351 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

core/css/header.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/header.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/header.scss

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,16 @@
134134
// Add some spacing so the last entry looks ok
135135
margin-inline-end: calc(3 * var(--default-grid-baseline));
136136

137-
// Only grow to match header-start on desktop, and only
138-
// in the user layout where header-center exists.
139-
// Below the mobile breakpoint the search collapses to an icon,
140-
// and header-end must stay content-sized so header-start pushes
141-
// that icon flush to the right edge. The public layout has
142-
// no centered search, so it keeps the content-sized header-end.
137+
// Grow to match header-start (which always grows) so the centered search
138+
// stays centered. Only on desktop and only in the layouts that render
139+
// header-center: the user layout and the settings layout (#body-settings).
140+
// Below the mobile breakpoint the search collapses to an icon, and
141+
// header-end must stay content-sized so header-start pushes that icon flush
142+
// to the right edge. The public layout has no centered search, so it keeps
143+
// the content-sized header-end.
143144
@media (min-width: 512px) {
144-
#body-user & {
145+
#body-user &,
146+
#body-settings & {
145147
flex: 1 0;
146148
}
147149
}

core/css/server.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)