diff --git a/changelogs/fragments/8320.yml b/changelogs/fragments/8320.yml new file mode 100644 index 000000000000..7d9ed1c7e624 --- /dev/null +++ b/changelogs/fragments/8320.yml @@ -0,0 +1,2 @@ +fix: +- Update osd to respect new oui breakpoints ([#8320](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8320)) \ No newline at end of file diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap index 23433a8514e7..1108d8184df4 100644 --- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap +++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap @@ -1860,6 +1860,8 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` Array [ "l", "xl", + "xxl", + "xxxl", ] } > @@ -3065,6 +3067,8 @@ exports[`CollapsibleNav renders the default nav 3`] = ` Array [ "l", "xl", + "xxl", + "xxxl", ] } > @@ -4182,6 +4186,8 @@ exports[`CollapsibleNav with custom branding renders the nav bar in dark mode 1` Array [ "l", "xl", + "xxl", + "xxxl", ] } > @@ -5298,6 +5304,8 @@ exports[`CollapsibleNav with custom branding renders the nav bar in default mode Array [ "l", "xl", + "xxl", + "xxxl", ] } > @@ -6407,6 +6415,8 @@ exports[`CollapsibleNav without custom branding renders the nav bar in dark mode Array [ "l", "xl", + "xxl", + "xxxl", ] } > @@ -7512,6 +7522,8 @@ exports[`CollapsibleNav without custom branding renders the nav bar in default m Array [ "l", "xl", + "xxl", + "xxxl", ] } > diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap index 2d6e0decd1d5..a500b1f1ff88 100644 --- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap +++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap @@ -3431,6 +3431,8 @@ exports[`Header handles visibility and lock changes 1`] = ` "m", "l", "xl", + "xxl", + "xxxl", ] } > @@ -3571,6 +3573,8 @@ exports[`Header handles visibility and lock changes 1`] = ` "m", "l", "xl", + "xxl", + "xxxl", ] } > @@ -4184,6 +4188,8 @@ exports[`Header handles visibility and lock changes 1`] = ` "m", "l", "xl", + "xxl", + "xxxl", ] } > @@ -4336,6 +4342,8 @@ exports[`Header handles visibility and lock changes 1`] = ` "m", "l", "xl", + "xxl", + "xxxl", ] } /> @@ -8680,6 +8688,8 @@ exports[`Header handles visibility and lock changes 1`] = ` Array [ "l", "xl", + "xxl", + "xxxl", ] } > @@ -27695,6 +27705,8 @@ exports[`Header toggles primary navigation menu when clicked 1`] = ` Array [ "l", "xl", + "xxl", + "xxxl", ] } > diff --git a/src/core/public/chrome/ui/header/collapsible_nav.tsx b/src/core/public/chrome/ui/header/collapsible_nav.tsx index 9c9223aa501b..43f1eb33dfd9 100644 --- a/src/core/public/chrome/ui/header/collapsible_nav.tsx +++ b/src/core/public/chrome/ui/header/collapsible_nav.tsx @@ -282,7 +282,7 @@ export function CollapsibleNav({ ))} {/* Docking button only for larger screens that can support it*/} - + + , ], @@ -205,7 +205,7 @@ export function Header({ }, { items: [ - + , , diff --git a/src/plugins/data/public/ui/query_editor/_query_editor.scss b/src/plugins/data/public/ui/query_editor/_query_editor.scss index e9655d245fde..88bb5e0d70ed 100644 --- a/src/plugins/data/public/ui/query_editor/_query_editor.scss +++ b/src/plugins/data/public/ui/query_editor/_query_editor.scss @@ -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; diff --git a/src/plugins/data/public/ui/query_string_input/_query_bar.scss b/src/plugins/data/public/ui/query_string_input/_query_bar.scss index f9849063f072..134120d90f6d 100644 --- a/src/plugins/data/public/ui/query_string_input/_query_bar.scss +++ b/src/plugins/data/public/ui/query_string_input/_query_bar.scss @@ -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; diff --git a/src/plugins/home/public/application/components/_solutions_section.scss b/src/plugins/home/public/application/components/_solutions_section.scss index b6d74387547c..e70aa85e2b47 100644 --- a/src/plugins/home/public/application/components/_solutions_section.scss +++ b/src/plugins/home/public/application/components/_solutions_section.scss @@ -45,7 +45,7 @@ max-width: calc(75% - #{$euiSizeM * 2}); } - @include euiBreakpoint("xl") { + @include euiBreakpoint("xl", "xxl", "xxxl") { max-width: calc(50% - #{$euiSizeM * 2}); } } diff --git a/src/plugins/opensearch_dashboards_overview/public/components/_overview.scss b/src/plugins/opensearch_dashboards_overview/public/components/_overview.scss index 3720cdd6c9a5..5071d2dcff1a 100644 --- a/src/plugins/opensearch_dashboards_overview/public/components/_overview.scss +++ b/src/plugins/opensearch_dashboards_overview/public/components/_overview.scss @@ -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}); } } @@ -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}); } } @@ -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; } } @@ -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}); } } diff --git a/src/plugins/vis_default_editor/public/_default.scss b/src/plugins/vis_default_editor/public/_default.scss index 7b563b907164..fa8e08abb161 100644 --- a/src/plugins/vis_default_editor/public/_default.scss +++ b/src/plugins/vis_default_editor/public/_default.scss @@ -22,7 +22,7 @@ width: 100% !important; } - @include euiBreakpoint("l", "xl") { + @include euiBreakpoint("l", "xl", "xxl", "xxxl") { max-width: 75%; } } diff --git a/src/plugins/vis_default_editor/public/_sidebar.scss b/src/plugins/vis_default_editor/public/_sidebar.scss index 3a6634108919..dbaa6c7121a5 100644 --- a/src/plugins/vis_default_editor/public/_sidebar.scss +++ b/src/plugins/vis_default_editor/public/_sidebar.scss @@ -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;