From 5fe489c5ae1bcb7aff0ef4ce3e34519963259c76 Mon Sep 17 00:00:00 2001
From: Wyatt Hoodes <hoodesw@hawaii.edu>
Date: Sun, 10 May 2020 08:55:32 -1000
Subject: [PATCH] dropdown-menu: Remove caret-down icon and fix alignment.

The alignment on narrow windows is also off.  We fix
this spacing issue while we're at it.
---
 static/styles/right-sidebar.scss |  2 +-
 static/styles/zulip.scss         | 20 +++++++++++++-------
 templates/zerver/app/navbar.html |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/static/styles/right-sidebar.scss b/static/styles/right-sidebar.scss
index fc96b64ed1..e8dea40652 100644
--- a/static/styles/right-sidebar.scss
+++ b/static/styles/right-sidebar.scss
@@ -159,7 +159,7 @@
     background-color: hsl(0, 0%, 89%);
     color: hsl(0, 0%, 52%);
     display: block;
-    width: 40px;
+    width: 45px;
     height: 19px;
     padding-top: 12px;
     padding-bottom: 9px;
diff --git a/static/styles/zulip.scss b/static/styles/zulip.scss
index f60c4762d5..7cbef11bd5 100644
--- a/static/styles/zulip.scss
+++ b/static/styles/zulip.scss
@@ -546,6 +546,10 @@ li.actual-dropdown-menu i {
     margin-right: 3px;
 }
 
+.settings-dropdown-cog {
+    padding-right: 14px;
+}
+
 .message_area_padder {
     /* The height of the header and the tabbar plus a small gap */
     margin-top: 57px;
@@ -1829,7 +1833,7 @@ div.focused_table {
         width: 0px;
         height: 0px;
         top: -7px;
-        right: 10px;
+        right: 14px;
         display: inline-block;
         border-right: 7px solid transparent;
         border-bottom: 7px solid hsl(0, 0%, 67%);
@@ -2175,12 +2179,6 @@ div.topic_edit_spinner .loading_indicator_spinner {
     top: 1px;
 }
 
-.settings-dropdown-caret {
-    margin-left: 8px;
-    margin-right: 8px;
-    font-size: 14px;
-}
-
 #notifications-area {
     position: fixed;
     z-index: 10;
@@ -2512,6 +2510,14 @@ select.inline_select_topic_edit {
         }
     }
 
+    .nav .dropdown-menu::after {
+        right: 21px;
+    }
+
+    .settings-dropdown-cog {
+        padding-right: 21px;
+    }
+
     .column-middle {
         margin-right: 7px;
     }
diff --git a/templates/zerver/app/navbar.html b/templates/zerver/app/navbar.html
index 972e4c1af8..1457aa2b6d 100644
--- a/templates/zerver/app/navbar.html
+++ b/templates/zerver/app/navbar.html
@@ -53,7 +53,7 @@
                 <ul class="nav" role="navigation">
                     <li class="dropdown actual-dropdown-menu" id="gear-menu">
                         <a id="settings-dropdown" href="#" role="button" class="dropdown-toggle" data-target="nada" data-toggle="dropdown" title="{{ _('Menu') }} (g)">
-                            <i class="fa fa-cog" aria-hidden="true"></i><i class="fa fa-caret-down settings-dropdown-caret" aria-hidden="true"></i>
+                            <i class="fa fa-cog settings-dropdown-cog" aria-hidden="true"></i>
                         </a>
                         <ul class="dropdown-menu" role="menu" aria-labelledby="settings-dropdown">
                             {#