From d2f907507857fb0d256c45dda34403ae1fe95cd8 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 17 Sep 2024 05:19:42 +0200 Subject: [PATCH] Increase no-gap-breakpoint by 32px to fix overflow (#31889) --- .../mastodon/features/ui/components/columns_area.jsx | 4 ++-- app/javascript/styles/mastodon/variables.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/javascript/mastodon/features/ui/components/columns_area.jsx b/app/javascript/mastodon/features/ui/components/columns_area.jsx index 063ac28d96..5a2ea8c2c8 100644 --- a/app/javascript/mastodon/features/ui/components/columns_area.jsx +++ b/app/javascript/mastodon/features/ui/components/columns_area.jsx @@ -63,8 +63,8 @@ export default class ColumnsArea extends ImmutablePureComponent { children: PropTypes.node, }; - // Corresponds to (max-width: $no-gap-breakpoint + 285px - 1px) in SCSS - mediaQuery = 'matchMedia' in window && window.matchMedia('(max-width: 1174px)'); + // Corresponds to (max-width: $no-gap-breakpoint - 1px) in SCSS + mediaQuery = 'matchMedia' in window && window.matchMedia('(max-width: 1206px)'); state = { renderComposePanel: !(this.mediaQuery && this.mediaQuery.matches), diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss index c477e7a750..17442b9748 100644 --- a/app/javascript/styles/mastodon/variables.scss +++ b/app/javascript/styles/mastodon/variables.scss @@ -87,7 +87,7 @@ $media-modal-media-max-width: 100%; // put margins on top and bottom of image to avoid the screen covered by image. $media-modal-media-max-height: 80%; -$no-gap-breakpoint: 1175px; +$no-gap-breakpoint: 1207px; $mobile-breakpoint: 630px; $font-sans-serif: 'mastodon-font-sans-serif' !default;