Skip to content
Snippets Groups Projects
Commit c780697c authored by Jannik Lehmann's avatar Jannik Lehmann :zero:
Browse files

Merge branch '392640-inconsistent-help-icons' into 'master'

Merge requests: Unify help icons

See merge request !116251



Merged-by: default avatarJannik Lehmann <jlehmann@gitlab.com>
Approved-by: default avatarAnnabel Dunstone Gray <annabel.m.gray@gmail.com>
Approved-by: default avatarJannik Lehmann <jlehmann@gitlab.com>
Co-authored-by: default avatarSascha Eggenberger <seggenberger@gitlab.com>
parents 2c33b3a9 39bfc010
No related branches found
No related tags found
3 merge requests!118700Remove refactor_vulnerability_filters feature flag,!116602Draft: Resolve "Remove the possibility to set redis_slot in known_events",!116251Merge requests: Unify help icons
Pipeline #824152282 passed with warnings
Pipeline: GitLab

#824162359

    Pipeline: GitLab

    #824162353

      Pipeline: GitLab

      #824153907

        Showing
        with 11 additions and 11 deletions
        ......@@ -187,7 +187,7 @@ export default {
        class="gl-display-flex gl-align-items-center gl-ml-2"
        >
        <gl-icon
        name="question"
        name="question-o"
        :aria-label="__('Link to go to GitLab pipeline documentation')"
        />
        </gl-link>
        ......@@ -251,7 +251,7 @@ export default {
        </span>
        {{ pipelineCoverageJobNumberText }}
        <span ref="pipelineCoverageQuestion">
        <gl-icon name="question" :size="12" />
        <gl-icon name="question-o" :size="12" />
        </span>
        <gl-tooltip
        :target="() => $refs.pipelineCoverageQuestion"
        ......
        ......@@ -35,7 +35,7 @@ export default {
        iconName: {
        type: String,
        required: false,
        default: 'question',
        default: 'question-o',
        },
        },
        };
        ......
        ......@@ -24,7 +24,7 @@ export default {
        <gl-icon
        id="pop-approver"
        tabindex="0"
        name="question"
        name="question-o"
        :aria-label="__('help')"
        :size="14"
        class="author-link gl-cursor-help"
        ......
        ......@@ -47,7 +47,7 @@ export default {
        <template #modal-footer="{ ok, cancel }">
        <section class="gl-display-flex gl-w-full">
        <p>
        <gl-icon name="question" :size="12" class="gl-text-blue-600" />
        <gl-icon name="question-o" :size="12" class="gl-text-blue-600" />
        <gl-sprintf
        :message="
        s__('LicenseCompliance|Learn more about %{linkStart}License Approvals%{linkEnd}')
        ......
        ......@@ -60,7 +60,7 @@ export default {
        <span v-if="description" class="gl-ml-3">
        <gl-icon
        ref="helpIcon"
        name="question"
        name="question-o"
        :aria-label="__('Help')"
        :size="14"
        class="author-link gl-cursor-help"
        ......
        ......@@ -52,7 +52,7 @@ export default {
        <span v-if="hasInvalidRules" class="gl-vertical-align-middle gl-text-gray-600 js-help gl-ml-3">
        <gl-icon
        :id="rule.name"
        name="question"
        name="question-o"
        class="author-link gl-cursor-help"
        :aria-label="__('help')"
        :size="14"
        ......
        ......@@ -105,7 +105,7 @@ export default {
        {{ s__('Licenses|Policy') }}
        <gl-icon
        ref="reportInfo"
        name="question"
        name="question-o"
        class="text-info gl-ml-2 gl-cursor-pointer"
        :aria-label="__('help')"
        :size="14"
        ......
        ......@@ -181,7 +181,7 @@ export default {
        data-testid="security-approval-help-link"
        target="_blank"
        >
        <gl-icon :size="12" name="question" />
        <gl-icon :size="12" name="question-o" />
        </gl-link>
        </div>
        </template>
        ......
        ......@@ -57,7 +57,7 @@ describe('Approval Check Popover', () => {
        });
        it('renders the default icon', () => {
        expect(wrapper.findComponent(GlIcon).props('name')).toBe('question');
        expect(wrapper.findComponent(GlIcon).props('name')).toBe('question-o');
        });
        describe('with a name for icon', () => {
        ......
        ......@@ -70,7 +70,7 @@ describe('EE Approvals LicenseCompliance Modal', () => {
        const findByHref = (href) => wrapper.find(`[href="${href}"`);
        const findModal = () => wrapper.findComponent(GlModalVuex);
        const findRuleForm = () => wrapper.findComponent(mocks.RuleForm);
        const findInformationIcon = () => wrapper.find('[name="question"]');
        const findInformationIcon = () => wrapper.find('[name="question-o"]');
        const findOkButton = () => wrapper.find('[name="ok"]');
        const findCancelButton = () => wrapper.find('[name="cancel"]');
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment