File tree Expand file tree Collapse file tree 2 files changed +21
-0
lines changed
polaris-react/src/components/Frame Expand file tree Collapse file tree 2 files changed +21
-0
lines changed Original file line number Diff line number Diff line change 1+ ---
2+ ' @shopify/polaris ' : patch
3+ ---
4+
5+ Fixed ` Frame ` scrollbar safe area to accommodate sidebar
Original file line number Diff line number Diff line change 295295
296296.ScrollbarSafeArea-TopBarAndReframe {
297297 @media (--p-breakpoints-md-up) {
298+ transition : width var (--p-motion-duration-250 ) var (--p-motion-ease );
298299 /* stylelint-disable -- polaris/conventions/polaris/custom-property-allowed-list -- Polaris component custom properties */
299300 width : calc (
300301 100vw - var (--pg-navigation-width ) -
301302 var (--pc-app-provider-scrollbar-width ) - var (--p-space-150 )
302303 );
303304 /* stylelint-enable -- polaris/conventions/polaris/custom-property-allowed-list */
304305 }
306+
307+ .hasSidebar & {
308+ transition : width var (--p-motion-duration-250 ) var (--p-motion-ease );
309+
310+ /* Sidebar breakpoint is 1200px */
311+ /* stylelint-disable-next-line polaris/media-queries/polaris/media-query-allowed-list -- custom breakpoint */
312+ @media screen and (min-width : 1200px ) {
313+ /* stylelint-disable-next-line polaris/conventions/polaris/custom-property-allowed-list -- private token from component */
314+ width : calc (
315+ 100vw - var (--pg-navigation-width ) -
316+ var (--pc-app-provider-scrollbar-width ) - var (--p-space-150 ) -
317+ var (--pc-sidebar-width )
318+ );
319+ }
320+ }
305321}
306322
307323.GlobalRibbonContainer {
You can’t perform that action at this time.
0 commit comments