From b839d09dfbbc4e7347b310543558513e5eefb583 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 5 Feb 2025 12:36:21 +0100
Subject: [PATCH] DEV: Fix `declaration-block-no-shorthand-property-overrides`
 (#31166)

---
 app/assets/stylesheets/common/admin/admin_base.scss | 1 -
 app/assets/stylesheets/common/admin/staff_logs.scss | 3 +--
 app/assets/stylesheets/common/base/json_schema.scss | 1 -
 app/assets/stylesheets/common/base/menu-panel.scss  | 1 -
 app/assets/stylesheets/common/base/user.scss        | 1 -
 stylelint.config.mjs                                | 1 -
 6 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 3ec363b9acb..cc86409cd73 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -311,7 +311,6 @@ $mobile-breakpoint: 700px;
       &::after {
         content: " ";
         position: absolute;
-        background-color: red;
         left: 0;
         right: 0;
         top: $maxHeight - $gradientHeight;
diff --git a/app/assets/stylesheets/common/admin/staff_logs.scss b/app/assets/stylesheets/common/admin/staff_logs.scss
index 338993a078e..1a45bcc186e 100644
--- a/app/assets/stylesheets/common/admin/staff_logs.scss
+++ b/app/assets/stylesheets/common/admin/staff_logs.scss
@@ -394,8 +394,7 @@ table.search-logs-list {
   @media screen and (min-width: 550px) {
     tr {
       td.term {
-        grid-column-start: 1;
-        grid-column: span 3;
+        grid-column-start: span 3;
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/json_schema.scss b/app/assets/stylesheets/common/base/json_schema.scss
index d3c646fc84a..0c153c3d220 100644
--- a/app/assets/stylesheets/common/base/json_schema.scss
+++ b/app/assets/stylesheets/common/base/json_schema.scss
@@ -72,7 +72,6 @@
       display: inline-block;
       margin-bottom: var(--space-2);
       color: var(--primary);
-      background-color: var(--secondary);
       border: 1px solid var(--primary-400);
       border-radius: var(--d-input-border-radius);
       background: svg-uri(
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index d7cd08adec5..f9e09b4a9dd 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -640,7 +640,6 @@
         display: flex;
         position: relative;
         overflow: visible;
-        margin-right: 0.5em;
         flex-shrink: 0;
         width: 2em;
         height: 2em;
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 22b0708d25d..07aed4681d2 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -125,7 +125,6 @@
         div {
           display: inline-flex;
           align-items: baseline;
-          margin-right: 15px;
           margin: 4px 0;
         }
       }
diff --git a/stylelint.config.mjs b/stylelint.config.mjs
index 093d880de06..c9e1244964c 100644
--- a/stylelint.config.mjs
+++ b/stylelint.config.mjs
@@ -29,7 +29,6 @@ export default {
     "scss/dollar-variable-pattern": null,
     "number-max-precision": null,
     "selector-pseudo-element-no-unknown": null,
-    "declaration-block-no-shorthand-property-overrides": null,
     "scss/at-extend-no-missing-placeholder": null,
     "scss/load-no-partial-leading-underscore": null,
     "scss/operator-no-newline-after": null,