diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-07-10 14:22:59 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-07-10 14:22:59 +0000 |
| commit | 473d36d1acc016b6cc494d1568bc31371531c724 (patch) | |
| tree | cb5e4ad86c7366a0ded52d1089de83bd73f1e31d /app | |
| parent | e787676b3752405cbe4ae75788c6cff53154783d (diff) | |
| parent | 91fff39efeb0aabec81c10f5d4e969ebbd385488 (diff) | |
| download | gitlab-ce-473d36d1acc016b6cc494d1568bc31371531c724.tar.gz | |
Merge branch 'fixed-dropdown-hover-styles' into 'master'
Fixed dropdown hover styles
Closes #64330 and #64340
See merge request gitlab-org/gitlab-ce!30534
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/confidential_merge_request/components/project_form_group.vue | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 5 |
2 files changed, 12 insertions, 3 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 99d77a75c23..197a0706062 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 @@ -105,7 +105,7 @@ export default { </script> <template> - <div class="form-group"> + <div class="confidential-merge-request-fork-group form-group"> <label>{{ __('Project') }}</label> <div> <dropdown @@ -126,6 +126,14 @@ export default { {{ __('No forks available to you.') }}<br /> <span v-html="noForkText"></span> </template> + <gl-link + :href="helpPagePath" + class="w-auto p-0 d-inline-block text-primary bg-transparent" + 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 e75c1379dfb..29f63e9578d 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -63,7 +63,8 @@ margin-top: 11px; } -.dropdown-toggle { +.dropdown-toggle, +.confidential-merge-request-fork-group .dropdown-toggle { padding: 6px 8px 6px 10px; background-color: $white-light; color: $gl-text-color; @@ -288,7 +289,7 @@ padding: 0 1px; a, - button:not(.dropdown-toggle,.ci-action-icon-container), + button, .menu-item { @include dropdown-link; } |