Skip to content

Commit

Permalink
fix: update osd to respect new oui breakpoints (opensearch-project#8320)
Browse files Browse the repository at this point in the history
* fix: update osd to respect new oui breakpoints

Signed-off-by: Viraj Sanghvi <virajs@amazon.com>

* Changeset file for PR opensearch-project#8320 created/updated

---------

Signed-off-by: Viraj Sanghvi <virajs@amazon.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
  • Loading branch information
1 parent d47d49c commit d3b776d
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 14 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/8320.yml
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))

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

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
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
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
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
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
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
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
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
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

0 comments on commit d3b776d

Please sign in to comment.