From 3572dcc67c4d3311813bcef40dca45f1cd5bb9e7 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulip.com>
Date: Wed, 5 Aug 2020 17:20:54 -0700
Subject: [PATCH] styles: Remove shorthand property overrides.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
---
 static/styles/popovers.scss             | 3 +--
 static/styles/portico/billing.scss      | 1 -
 static/styles/portico/landing-page.scss | 4 ----
 static/styles/portico/portico.scss      | 2 --
 static/styles/rendered_markdown.scss    | 1 -
 static/styles/settings.scss             | 1 -
 static/styles/user_circles.scss         | 1 -
 stylelint.config.js                     | 1 -
 8 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/static/styles/popovers.scss b/static/styles/popovers.scss
index 68d92d06ba..d275ff27a6 100644
--- a/static/styles/popovers.scss
+++ b/static/styles/popovers.scss
@@ -431,11 +431,10 @@ ul {
     justify-content: flex-start;
 
     #select_stream_id {
-        margin-bottom: 5px !important;
         border-left: 0px;
         padding-left: 0px;
         border-radius: 3px;
-        margin: 0 5px 0 -10px;
+        margin: 0 5px 5px -10px;
         text-indent: 10px;
     }
     .inline_topic_edit {
diff --git a/static/styles/portico/billing.scss b/static/styles/portico/billing.scss
index cb6bd3bbc4..0a694e815f 100644
--- a/static/styles/portico/billing.scss
+++ b/static/styles/portico/billing.scss
@@ -119,7 +119,6 @@
         padding: 11px 25px 11px 25px;
         font-weight: 400;
         color: hsl(0, 0%, 100%);
-        background-color: hsl(185, 38%, 55%);
         background: linear-gradient(
             145deg,
             hsl(191, 56%, 55%),
diff --git a/static/styles/portico/landing-page.scss b/static/styles/portico/landing-page.scss
index b0113ba85c..1134b954d7 100644
--- a/static/styles/portico/landing-page.scss
+++ b/static/styles/portico/landing-page.scss
@@ -1355,7 +1355,6 @@ nav {
     height: 520px;
     margin: 20px auto;
     padding: 30px 20px;
-    background-color: hsla(220, 20%, 97%, 0.6);
     background: linear-gradient(
         hsla(220, 20%, 97%, 0.4),
         hsla(220, 20%, 97%, 0.9)
@@ -1370,7 +1369,6 @@ nav {
     font-size: 1.2rem;
     font-weight: 400;
     color: hsl(0, 0%, 100%);
-    background-color: hsl(185, 38%, 55%);
     background: linear-gradient(145deg, hsl(191, 56%, 55%), hsl(169, 65%, 42%));
     box-shadow: 0px 3px 10px hsla(0, 0%, 0%, 0.2);
     border: 0;
@@ -1545,7 +1543,6 @@ nav {
     font-weight: 400;
     color: hsl(0, 0%, 100%);
 
-    background-color: hsl(185, 38%, 55%);
     background: linear-gradient(145deg, hsl(191, 56%, 55%), hsl(169, 65%, 42%));
     box-shadow: 0px 3px 10px hsla(0, 0%, 0%, 0.2);
     border-radius: 4px;
@@ -1852,7 +1849,6 @@ nav {
     padding: 200px 80px 100px 80px;
     margin-top: -50px;
 
-    background-color: hsl(177, 52%, 55%);
     background: linear-gradient(145deg, hsl(191, 56%, 55%), hsl(169, 65%, 42%));
 
     color: hsl(0, 0%, 100%);
diff --git a/static/styles/portico/portico.scss b/static/styles/portico/portico.scss
index 21a3b791fc..f9c19bec88 100644
--- a/static/styles/portico/portico.scss
+++ b/static/styles/portico/portico.scss
@@ -690,7 +690,6 @@ input.text-error {
 }
 
 .main-headline {
-    background-color: hsl(218, 84%, 85%);
     background: url(/static/images/landing-page/gg.jpg);
     background-position: center;
     background-size: cover;
@@ -1745,7 +1744,6 @@ input.new-organization-button {
 
 #navbar-custom-message {
     font-size: 1rem;
-    background-color: hsl(177, 52%, 55%);
     background: linear-gradient(145deg, hsl(191, 56%, 55%), hsl(169, 65%, 42%));
     color: hsl(0, 0%, 100%);
     font-weight: 600;
diff --git a/static/styles/rendered_markdown.scss b/static/styles/rendered_markdown.scss
index 3de31c401a..0117ab9fca 100644
--- a/static/styles/rendered_markdown.scss
+++ b/static/styles/rendered_markdown.scss
@@ -118,7 +118,6 @@
 
     .user-group-mention,
     .user-mention {
-        background-color: hsl(0, 0%, 93%);
         border-radius: 3px;
         padding: 0 0.2em;
         box-shadow: 0px 0px 0px 1px hsl(0, 0%, 80%);
diff --git a/static/styles/settings.scss b/static/styles/settings.scss
index 56faf92fa6..e7ecde4fb1 100644
--- a/static/styles/settings.scss
+++ b/static/styles/settings.scss
@@ -1613,7 +1613,6 @@ body:not(.night-mode) #settings_page .custom_user_field .datepicker {
 }
 
 #muted_topics_table {
-    margin-bottom: 0px;
     width: 90%;
     margin: 0 auto;
 
diff --git a/static/styles/user_circles.scss b/static/styles/user_circles.scss
index 81bbae265c..c25be8be25 100644
--- a/static/styles/user_circles.scss
+++ b/static/styles/user_circles.scss
@@ -21,7 +21,6 @@
 
 .user_circle_orange {
     border-color: hsl(29, 84%, 51%);
-    background-color: hsl(29, 84%, 51%);
     background: linear-gradient(
         to bottom,
         hsla(0, 0%, 100%, 0) 50%,
diff --git a/stylelint.config.js b/stylelint.config.js
index 2225214846..3c62cccfc0 100644
--- a/stylelint.config.js
+++ b/stylelint.config.js
@@ -8,7 +8,6 @@ module.exports = {
         "property-no-unknown": [true, {ignoreProperties: [/^mso-/]}],
 
         // Disable recommended rules we don't comply with yet
-        "declaration-block-no-shorthand-property-overrides": null,
         "font-family-no-missing-generic-family-keyword": null,
         "no-descending-specificity": null,
         "no-duplicate-selectors": null,