From 32b2dbb0c4dd542034e8e4f16dc62cc3ccb0c04d Mon Sep 17 00:00:00 2001 From: David O'Regan Date: Fri, 27 Mar 2020 11:02:18 +0000 Subject: [PATCH 1/2] fix(tooltip): update tooltip scss import to address style issues --- src/assets/styles/gitlab_ui.scss | 1 - src/assets/styles/global.scss | 1 + src/components/list_incident.vue | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/styles/gitlab_ui.scss b/src/assets/styles/gitlab_ui.scss index 94b93cb1..bbe66203 100644 --- a/src/assets/styles/gitlab_ui.scss +++ b/src/assets/styles/gitlab_ui.scss @@ -10,5 +10,4 @@ @import '@gitlab/ui/src/components/base/loading_icon/loading_icon'; @import '@gitlab/ui/src/components/base/alert/alert'; @import '@gitlab/ui/src/components/base/new_button/new_button'; -@import '@gitlab/ui/src/components/base/tooltip/tooltip'; @import '@gitlab/ui/src/components/base/navbar/navbar'; diff --git a/src/assets/styles/global.scss b/src/assets/styles/global.scss index 01614238..7e7cf7c0 100644 --- a/src/assets/styles/global.scss +++ b/src/assets/styles/global.scss @@ -1,6 +1,7 @@ @import 'gitlab_ui'; @import 'bootstrap'; @import 'bootstrap-vue'; +@import '@gitlab/ui/src/components/base/tooltip/tooltip'; @import 'common'; /* diff --git a/src/components/list_incident.vue b/src/components/list_incident.vue index 9537343f..a6c99a2b 100644 --- a/src/components/list_incident.vue +++ b/src/components/list_incident.vue @@ -57,7 +57,7 @@ export default { >
{{ createdAtDate }} - +
{{ createdAtDateTime }}
{{ createdAtTimeZone }}
-- GitLab From 31aa4ba102d765bdd51f522c7f5070cf727c1e23 Mon Sep 17 00:00:00 2001 From: David O'Regan Date: Fri, 27 Mar 2020 11:02:36 +0000 Subject: [PATCH 2/2] fix(tooltip): update tooltip scss import to address style issues --- tests/unit/components/__snapshots__/list_incident_spec.js.snap | 1 + tests/unit/views/__snapshots__/list_spec.js.snap | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/unit/components/__snapshots__/list_incident_spec.js.snap b/tests/unit/components/__snapshots__/list_incident_spec.js.snap index 619085eb..6a396688 100644 --- a/tests/unit/components/__snapshots__/list_incident_spec.js.snap +++ b/tests/unit/components/__snapshots__/list_incident_spec.js.snap @@ -12,6 +12,7 @@ exports[`List Incident renders the component 1`] = `