diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-07-09 15:19:18 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-07-09 15:19:18 +0000 |
| commit | 54820ac996f29c4c6af084def7d5efdaf70b3f05 (patch) | |
| tree | e9edaf882a1994c5b0e4c8b93acdaf0393b0fb33 /app | |
| parent | db1b15e4245547a4468ab70d337a73a40d4fc98c (diff) | |
| parent | 63c84a9a56159876b2743b83de609aa8ad4433fb (diff) | |
| download | gitlab-ce-54820ac996f29c4c6af084def7d5efdaf70b3f05.tar.gz | |
Merge branch 'dropdown-styling-fixes' into 'master'
Fix dropdown styling issues
Closes #64250
See merge request gitlab-org/gitlab-ce!30477
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/confidential_merge_request/components/project_form_group.vue | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 4 |
2 files changed, 2 insertions, 6 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; } |