Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] fix: update osd to respect new oui breakpoints #8327

Merged
merged 1 commit into from
Sep 26, 2024
Merged

[Backport 2.x] fix: update osd to respect new oui breakpoints #8327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions changelogs/fragments/8320.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fix:
- Update osd to respect new oui breakpoints ([#8320](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8320))
12 changes: 12 additions & 0 deletions src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/core/public/chrome/ui/header/collapsible_nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ export function CollapsibleNav({
))}

{/* Docking button only for larger screens that can support it*/}
<EuiShowFor sizes={['l', 'xl']}>
<EuiShowFor sizes={['l', 'xl', 'xxl', 'xxxl']}>
<EuiCollapsibleNavGroup>
<EuiListGroup flush>
<EuiListGroupItem
Expand Down
4 changes: 2 additions & 2 deletions src/core/public/chrome/ui/header/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,15 +197,15 @@ export function Header({
},
{
items: [
<EuiShowFor sizes={['m', 'l', 'xl']}>
<EuiShowFor sizes={['m', 'l', 'xl', 'xxl', 'xxxl']}>
<HeaderNavControls navControls$={observables.navControlsExpandedCenter$} />
</EuiShowFor>,
],
borders: 'none',
},
{
items: [
<EuiHideFor sizes={['m', 'l', 'xl']}>
<EuiHideFor sizes={['m', 'l', 'xl', 'xxl', 'xxxl']}>
<HeaderNavControls navControls$={observables.navControlsExpandedCenter$} />
</EuiHideFor>,
<HeaderNavControls navControls$={observables.navControlsExpandedRight$} />,
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/data/public/ui/query_editor/_query_editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
}

// IE specific fix for the datepicker to not collapse
@include euiBreakpoint("m", "l", "xl") {
@include euiBreakpoint("m", "l", "xl", "xxl", "xxxl") {
.osdQueryEditor__datePickerWrapper {
max-width: 40vw;
flex-grow: 0 !important;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/data/public/ui/query_string_input/_query_bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
}

// IE specific fix for the datepicker to not collapse
@include euiBreakpoint("m", "l", "xl") {
@include euiBreakpoint("m", "l", "xl", "xxl", "xxl") {
.osdQueryBar__datePickerWrapper {
max-width: 40vw;
flex-grow: 0 !important;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/home/public/application/components/_solutions_section.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
max-width: calc(75% - #{$euiSizeM * 2});
}

@include euiBreakpoint("xl") {
@include euiBreakpoint("xl", "xxl", "xxxl") {
max-width: calc(50% - #{$euiSizeM * 2});
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/plugins/opensearch_dashboards_overview/public/components/_overview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@

.osdOverviewApps__item {
.osdOverviewApps__group--primary & {
@include euiBreakpoint("m", "l", "xl") {
@include euiBreakpoint("m", "l", "xl", "xxl", "xxl") {
max-width: calc(50% - #{$euiSizeM * 2});
}
}

.osdOverviewApps__group--secondary & {
@include euiBreakpoint("m", "l", "xl") {
@include euiBreakpoint("m", "l", "xl", "xxl", "xxxl") {
max-width: calc(25% - #{$euiSizeM * 2});
}
}
Expand All @@ -86,7 +86,7 @@
}

.osdOverviewMore__item {
@include euiBreakpoint("m", "l", "xl") {
@include euiBreakpoint("m", "l", "xl", "xxl", "xxxl") {
max-width: calc(33.3333% - #{$euiSizeM * 2});
}
}
Expand All @@ -101,13 +101,13 @@

.osdOverviewSupplements--noNews .osdOverviewMore {
h2 {
@include euiBreakpoint("m", "l", "xl") {
@include euiBreakpoint("m", "l", "xl", "xxl", "xxxl") {
text-align: center;
}
}

.osdOverviewMore__content {
@include euiBreakpoint("m", "l", "xl") {
@include euiBreakpoint("m", "l", "xl", "xxl", "xxxl") {
justify-content: center;
}
}
Expand All @@ -129,7 +129,7 @@
}

.osdOverviewDataManage__item:not(:only-child) {
@include euiBreakpoint("m", "l", "xl") {
@include euiBreakpoint("m", "l", "xl", "xxl", "xxxl") {
flex: 0 0 calc(50% - #{$euiSizeM * 2});
}
}
2 changes: 1 addition & 1 deletion src/plugins/vis_default_editor/public/_default.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
width: 100% !important;
}

@include euiBreakpoint("l", "xl") {
@include euiBreakpoint("l", "xl", "xxl", "xxxl") {
max-width: 75%;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/vis_default_editor/public/_sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
flex-grow: 0;
}

@include euiBreakpoint("l", "xl") {
@include euiBreakpoint("l", "xl", "xxl", "xxxl") {
@include flex-parent(1, 1, 1px);
@include euiScrollBar;

Expand Down
Loading