Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 9 deletions

diff --git a/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue b/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue
index da792b3a2aa..0de4cb2e59f 100644
--- a/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue
+++ b/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue
@@ -307,7 +307,12 @@ export default {
     @close="handleClose"
   >
     <template #collapsed>
-      <div v-if="isClassicSidebar" v-gl-tooltip class="sidebar-collapsed-icon">
+      <div
+        v-if="isClassicSidebar"
+        v-gl-tooltip.left.viewport
+        :title="attributeTypeTitle"
+        class="sidebar-collapsed-icon"
+      >
         <gl-icon :size="16" :aria-label="attributeTypeTitle" :name="attributeTypeIcon" />
         <span class="collapse-truncated-title">
           {{ attributeTitle }}
diff --git a/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue b/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue
index a9c4203af22..8c56c3cbd57 100644
--- a/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue
+++ b/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue
@@ -177,19 +177,14 @@ export default {
     />
     <gl-button
       v-if="isClassicSidebar"
+      v-gl-tooltip.left.viewport
+      :title="tootltipTitle"
       category="tertiary"
       type="reset"
       class="sidebar-collapsed-icon sidebar-collapsed-container gl-rounded-0! gl-shadow-none!"
       @click.stop.prevent="toggleTodo"
     >
-      <gl-icon
-        v-gl-tooltip.left.viewport
-        :title="tootltipTitle"
-        :size="16"
-        :class="{ 'todo-undone': hasTodo }"
-        :name="collapsedButtonIcon"
-        :aria-label="collapsedButtonIcon"
-      />
+      <gl-icon :class="{ 'todo-undone': hasTodo }" :name="collapsedButtonIcon" />
     </gl-button>
   </div>
 </template>