From f44827fa3d01ca660daffbeefffe1da5834e5ee5 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 11 Feb 2025 15:33:10 +0100 Subject: [PATCH] DEV: Fix `mixed-decls` sass deprecation (#31279) See: https://sass-lang.com/d/mixed-decls ```diff - WARNING: 253 deprecations encountered while compiling scss. + WARNING: 242 deprecations encountered while compiling scss. ``` --- app/assets/stylesheets/common/admin/admin_base.scss | 13 +++++++------ app/assets/stylesheets/common/admin/customize.scss | 12 +++++++----- app/assets/stylesheets/common/admin/settings.scss | 7 ++++--- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index aa688abbc9e..6943b0425a1 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -307,6 +307,13 @@ $mobile-breakpoint: 700px; max-height: $maxHeight; overflow: hidden; position: relative; + color: var(--primary-medium); + + @include breakpoint(mobile-extra-large) { + word-wrap: break-word; + max-width: 80vw; + margin-right: 3em; + } &::after { content: " "; @@ -321,12 +328,6 @@ $mobile-breakpoint: 700px; rgba(var(--secondary-rgb), 0.15) ); } - @include breakpoint(mobile-extra-large) { - word-wrap: break-word; - max-width: 80vw; - margin-right: 3em; - } - color: var(--primary-medium); } } diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss index 9aea3ab7093..059fff1afba 100644 --- a/app/assets/stylesheets/common/admin/customize.scss +++ b/app/assets/stylesheets/common/admin/customize.scss @@ -386,16 +386,17 @@ max-height: 60vh; border-bottom-right-radius: var(--d-border-radius); border-bottom-left-radius: var(--d-border-radius); + border-right: 1px solid var(--primary-low); + border-bottom: 1px solid var(--primary-low); + border-left: 1px solid var(--primary-low); + width: 100%; + @media screen and (max-height: 1000px) { max-height: 50vh; } @media screen and (max-height: 800px) { max-height: 40vh; } - border-right: 1px solid var(--primary-low); - border-bottom: 1px solid var(--primary-low); - border-left: 1px solid var(--primary-low); - width: 100%; &__item:last-child { border-bottom: none; @@ -557,10 +558,11 @@ } .setting-label { + word-wrap: break-word; + @include breakpoint(tablet, min-width) { width: 25%; } - word-wrap: break-word; h3 { margin-top: 0; diff --git a/app/assets/stylesheets/common/admin/settings.scss b/app/assets/stylesheets/common/admin/settings.scss index 64ba83a4390..834cfd6bd9f 100644 --- a/app/assets/stylesheets/common/admin/settings.scss +++ b/app/assets/stylesheets/common/admin/settings.scss @@ -83,15 +83,16 @@ } .input-setting-list { - @media (max-width: $mobile-breakpoint) { - width: 100%; - } padding: 1px; background-color: var(--secondary); border: 1px solid var(--primary-low); border-radius: 3px; transition: border linear 0.2s, box-shadow linear 0.2s; + @media (max-width: $mobile-breakpoint) { + width: 100%; + } + li.sortable-placeholder { @include unselectable; padding: 3px 5px 3px 18px;