From 63c84a9a56159876b2743b83de609aa8ad4433fb Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 9 Jul 2019 09:35:53 +0100
Subject: [PATCH] Fix dropdown styling issues

---
 .../components/project_form_group.vue         |  4 ---
 .../stylesheets/framework/dropdowns.scss      |  4 +--
 .../project_form_group_spec.js.snap           | 34 -------------------
 3 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue b/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue
index 29d2cca6aed..99d77a75c23 100644
--- a/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue
+++ b/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue
@@ -126,10 +126,6 @@ export default {
           {{ __('No forks available to you.') }}<br />
           <span v-html="noForkText"></span>
         </template>
-        <gl-link :href="helpPagePath" class="help-link" target="_blank">
-          <span class="sr-only">{{ __('Read more') }}</span>
-          <i class="fa fa-question-circle" aria-hidden="true"></i>
-        </gl-link>
       </p>
     </div>
   </div>
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index a12029d2419..e75c1379dfb 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -287,8 +287,8 @@
     list-style: none;
     padding: 0 1px;
 
-    a:not(.help-link),
-    button:not(.btn),
+    a,
+    button:not(.dropdown-toggle,.ci-action-icon-container),
     .menu-item {
       @include dropdown-link;
     }
diff --git a/spec/frontend/confidential_merge_request/components/__snapshots__/project_form_group_spec.js.snap b/spec/frontend/confidential_merge_request/components/__snapshots__/project_form_group_spec.js.snap
index ba0ee8dfd59..fd307ce5ab3 100644
--- a/spec/frontend/confidential_merge_request/components/__snapshots__/project_form_group_spec.js.snap
+++ b/spec/frontend/confidential_merge_request/components/__snapshots__/project_form_group_spec.js.snap
@@ -28,23 +28,6 @@ exports[`Confidential merge request project form group component renders empty s
         </a>
          and set the forks visiblity to private.
       </span>
-       
-      <gllink-stub
-        class="help-link"
-        href="/help"
-        target="_blank"
-      >
-        <span
-          class="sr-only"
-        >
-          Read more
-        </span>
-         
-        <i
-          aria-hidden="true"
-          class="fa fa-question-circle"
-        />
-      </gllink-stub>
     </p>
   </div>
 </div>
@@ -78,23 +61,6 @@ exports[`Confidential merge request project form group component renders fork dr
         </a>
          and set the forks visiblity to private.
       </span>
-       
-      <gllink-stub
-        class="help-link"
-        href="/help"
-        target="_blank"
-      >
-        <span
-          class="sr-only"
-        >
-          Read more
-        </span>
-         
-        <i
-          aria-hidden="true"
-          class="fa fa-question-circle"
-        />
-      </gllink-stub>
     </p>
   </div>
 </div>