diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-28 12:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-28 12:08:51 +0300 |
commit | 19db975aa58a294be1e4b428fb42b27956c7423d (patch) | |
tree | b40a4df42ba53fa3c598f5787106f2606abf924d /app | |
parent | a1ea041b49c20794ea94564bf07837692645ce11 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
7 files changed, 7 insertions, 23 deletions
diff --git a/app/assets/javascripts/blob/pipeline_tour_success_modal.vue b/app/assets/javascripts/blob/pipeline_tour_success_modal.vue index f3c542c467a..0cc75d28e0b 100644 --- a/app/assets/javascripts/blob/pipeline_tour_success_modal.vue +++ b/app/assets/javascripts/blob/pipeline_tour_success_modal.vue @@ -94,14 +94,12 @@ export default { <gl-modal visible size="sm" modal-id="success-pipeline-modal-id-not-used"> <template #modal-title> {{ $options.i18n.modalTitle }} - <gl-emoji class="gl-vertical-align-baseline font-size-inherit gl-mr-1" data-name="tada" /> + <gl-emoji class="gl-vertical-align-baseline gl-reset-font-size gl-mr-1" data-name="tada" /> </template> <p> <gl-sprintf :message="$options.i18n.bodyMessage"> <template #codeQualityLink="{ content }"> - <gl-link :href="codeQualityLink" target="_blank" class="font-size-inherit">{{ - content - }}</gl-link> + <gl-link :href="codeQualityLink" target="_blank">{{ content }}</gl-link> </template> </gl-sprintf> </p> diff --git a/app/assets/javascripts/projects/settings_service_desk/components/custom_email_wrapper.vue b/app/assets/javascripts/projects/settings_service_desk/components/custom_email_wrapper.vue index 03ba99bcf71..f72aa19bdf2 100644 --- a/app/assets/javascripts/projects/settings_service_desk/components/custom_email_wrapper.vue +++ b/app/assets/javascripts/projects/settings_service_desk/components/custom_email_wrapper.vue @@ -234,7 +234,6 @@ export default { :href="$options.FEEDBACK_ISSUE_URL" target="_blank" data-testid="feedback-link" - class="gl-text-blue-600 font-size-inherit" >{{ content }} </gl-link> </template> diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue index e968d935f20..2c447c3066e 100644 --- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue +++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue @@ -240,12 +240,7 @@ export default { " > <template #link="{ content }"> - <gl-link - :href="emailSuffixHelpUrl" - target="_blank" - class="gl-text-blue-600 font-size-inherit" - >{{ content }} - </gl-link> + <gl-link :href="emailSuffixHelpUrl" target="_blank">{{ content }} </gl-link> </template> </gl-sprintf> </template> @@ -259,10 +254,7 @@ export default { " > <template #link="{ content }"> - <gl-link - :href="serviceDeskEmailAddressHelpUrl" - target="_blank" - class="gl-text-blue-600 font-size-inherit" + <gl-link :href="serviceDeskEmailAddressHelpUrl" target="_blank" >{{ content }} </gl-link> </template> diff --git a/app/assets/javascripts/releases/components/release_block_header.vue b/app/assets/javascripts/releases/components/release_block_header.vue index 070865cf84b..b4c897a8236 100644 --- a/app/assets/javascripts/releases/components/release_block_header.vue +++ b/app/assets/javascripts/releases/components/release_block_header.vue @@ -50,7 +50,7 @@ export default { <template> <div class="card-header d-flex align-items-center bg-white pr-0"> <h2 class="card-title my-2 mr-auto"> - <gl-link v-if="selfLink" :href="selfLink" class="font-size-inherit"> + <gl-link v-if="selfLink" :href="selfLink"> {{ release.name }} </gl-link> <template v-else> diff --git a/app/assets/javascripts/snippets/components/snippet_header.vue b/app/assets/javascripts/snippets/components/snippet_header.vue index 8476231b5d2..573b8777ade 100644 --- a/app/assets/javascripts/snippets/components/snippet_header.vue +++ b/app/assets/javascripts/snippets/components/snippet_header.vue @@ -248,7 +248,7 @@ export default { <gl-emoji v-if="snippet.author.status" v-gl-tooltip - class="gl-vertical-align-baseline font-size-inherit gl-mr-1" + class="gl-vertical-align-baseline gl-reset-font-size gl-mr-1" :title="snippet.author.status.message" :data-name="snippet.author.status.emoji" /> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue index 45958d7fb8d..c70213ad8a2 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue @@ -99,11 +99,7 @@ export default { <p class="gl-mt-2"> <gl-sprintf :message="$options.SP_HELP_CONTENT"> <template #link="{ content }"> - <gl-link - data-testid="help" - :href="$options.SP_HELP_URL" - target="_blank" - class="font-size-inherit" + <gl-link data-testid="help" :href="$options.SP_HELP_URL" target="_blank" >{{ content }} </gl-link> </template> diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss index d6500529170..347b8e20ab4 100644 --- a/app/assets/stylesheets/utilities.scss +++ b/app/assets/stylesheets/utilities.scss @@ -65,7 +65,6 @@ min-width: 0; } -.font-size-inherit { font-size: inherit; } .gl-w-16 { width: px-to-rem($grid-size * 2); } .gl-w-64 { width: px-to-rem($grid-size * 8); } .gl-h-32 { height: px-to-rem($grid-size * 4); } |