Skip to content

A platform for community discussion. Free, open, simple.

UX: avoid scroll when it's not neccessary (#38760)

Krisfb8ef7ee72f0
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss
index 77121fc1273..3b96756ec53 100644
--- a/app/assets/stylesheets/admin/admin_base.scss
+++ b/app/assets/stylesheets/admin/admin_base.scss
@@ -910,7 +910,7 @@ $mobile-breakpoint: 700px;
background-color: var(--secondary);
margin-left: 0;
border-left: solid 1px var(--content-border-color);
- padding: 30px 0 90px 30px;
+ padding: 30px 0 0 30px;
width: 82%;
box-sizing: border-box;
diff --git a/app/assets/stylesheets/admin/site-settings.scss b/app/assets/stylesheets/admin/site-settings.scss
index 31a971eaa7a..26d1d284cd4 100644
--- a/app/assets/stylesheets/admin/site-settings.scss
+++ b/app/assets/stylesheets/admin/site-settings.scss
@@ -14,6 +14,11 @@
padding: 1em;
}
+body.has-admin-changes-banner #main-outlet {
+ // makes space so banner doesn't overlap content
+ padding-bottom: 6em;
+}
+
.admin-changes-banner {
box-sizing: border-box;
display: flex;
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 38e267c20c0..202d492cfd8 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -1170,11 +1170,6 @@ body.has-sidebar-page {
@include viewport.until(lg) {
--d-main-content-gap: var(--space-4);
}
-
- @media screen and (width < 87rem) {
- // ideal width just slightly larger than our xl viewport variable
- padding-inline: 0;
- }
}
}
diff --git a/app/assets/stylesheets/common/base/sidebar.scss b/app/assets/stylesheets/common/base/sidebar.scss
index 043efa02e4c..c5ae664f215 100644
--- a/app/assets/stylesheets/common/base/sidebar.scss
+++ b/app/assets/stylesheets/common/base/sidebar.scss
@@ -85,6 +85,11 @@
align-self: start;
overflow-y: auto;
+ @include viewport.until(md) {
+ // height gets in the way in slide-out mode
+ height: auto;
+ }
+
// back-compat for themes
--1dvh: 1dvh;
diff --git a/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss b/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss
index 865b4b9da3d..f416329ac06 100644
--- a/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss
+++ b/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss
@@ -37,10 +37,6 @@
font-size: var(--font-up-3);
}
- .form-kit {
- padding-bottom: 6em; // space for save footer
- }
-
.form-kit__field-toggle {
flex-direction: column;
width: 100%;
diff --git a/frontend/discourse/admin/components/changes-banner.gjs b/frontend/discourse/admin/components/changes-banner.gjs
index 486f9e8b259..5e96efdc2c8 100644
--- a/frontend/discourse/admin/components/changes-banner.gjs
+++ b/frontend/discourse/admin/components/changes-banner.gjs
@@ -4,6 +4,7 @@ import { action } from "@ember/object";
import { trustHTML } from "@ember/template";
import { modifier } from "ember-modifier";
import DButton from "discourse/components/d-button";
+import bodyClass from "discourse/helpers/body-class";
export default class ChangesBanner extends Component {
@tracked isSaving = false;
@@ -37,6 +38,7 @@ export default class ChangesBanner extends Component {
}
<template>
+ {{bodyClass "has-admin-changes-banner"}}
<div class="admin-changes-banner" {{this.resizerModifier}}>
<span class="admin-changes-banner__main-label">{{trustHTML
@bannerLabel
diff --git a/themes/horizon/scss/chat.scss b/themes/horizon/scss/chat.scss
index 66abfdd2a4f..33202370354 100644
--- a/themes/horizon/scss/chat.scss
+++ b/themes/horizon/scss/chat.scss
@@ -21,6 +21,13 @@
body.has-full-page-chat {
background-color: var(--background-color);
+
+ #main-outlet-wrapper {
+ @media screen and (width < 87rem) {
+ // ideal width just slightly larger than our xl viewport variable
+ padding-inline: 0;
+ }
+ }
}
.chat-drawer-container {