diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue index 98f682c2e8ad08b35e23a723b07d2ff0c6f419d0..5305894873f763b89080175508c91edd2bf8617b 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue @@ -51,7 +51,7 @@ export default { rel="noopener noreferrer nofollow" data-container="body" > - <icon name="question-o" /> + <icon name="question" /> </a> </div> </template> diff --git a/changelogs/unreleased/199053-inconsistent-help-icon-styling.yml b/changelogs/unreleased/199053-inconsistent-help-icon-styling.yml new file mode 100644 index 0000000000000000000000000000000000000000..3d11351ca8bb62d61d4829c35bad1fe64a938ee7 --- /dev/null +++ b/changelogs/unreleased/199053-inconsistent-help-icon-styling.yml @@ -0,0 +1,5 @@ +--- +title: Update merge request widget question mark icons +merge_request: 30759 +author: +type: other diff --git a/ee/app/assets/javascripts/approvals/components/empty_rule_name.vue b/ee/app/assets/javascripts/approvals/components/empty_rule_name.vue index 077b4e461740f6264ed18f3c7667289c264fba62..62c1a3a410f633bd33a0564f40385fec5bf2fa62 100644 --- a/ee/app/assets/javascripts/approvals/components/empty_rule_name.vue +++ b/ee/app/assets/javascripts/approvals/components/empty_rule_name.vue @@ -25,7 +25,7 @@ export default { <icon id="pop-approver" tabindex="0" - name="question-o" + name="question" :aria-label="__('help')" :size="14" class="author-link suggestion-help-hover" diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue b/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue index 3fcefc73ef02a0ec29b74eb0aaab4898f745f10b..6a064eb68d7fb80440a8bcf4c68f83dbbd04adf7 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue +++ b/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue @@ -41,7 +41,7 @@ export default { target="_blank" class="d-flex-center pl-1" > - <icon name="question-o" /> + <icon name="question" /> </gl-link> </div> </template>