Review changes

4 files changed, 36 insertions, 27 deletions

diff --git a/app/assets/javascripts/milestone.js b/app/assets/javascripts/milestone.js
index 046c8908a38..23231ba5649 100644
--- a/app/assets/javascripts/milestone.js
+++ b/app/assets/javascripts/milestone.js
@@ -62,11 +62,8 @@ export default class Milestone {
     })
     .on('mouseenter', mouseenter)
     .on('mouseleave', debouncedMouseleave())
-    .on('show.bs.popover', () => {
+    .one('show.bs.popover', () => {
       window.addEventListener('scroll', hideOnScroll);
-    })
-    .on('hide.bs.popover', () => {
-      window.removeEventListener('scroll', hideOnScroll);
     });
   }
 }
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index b10cdf206a0..bfae252eb42 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -423,26 +423,42 @@
 }
 
 .btn-link {
-  &.btn-secondary-hover-link {
-    color: $gl-text-color-secondary;
+  padding: 0;
+  background-color: transparent;
+  color: $blue-600;
+  font-weight: normal;
+  border-radius: 0;
+  border-color: transparent;
 
-    &:hover,
-    &:active,
-    &:focus {
-      color: $gl-link-color;
-      text-decoration: none;
-    }
+  &:hover,
+  &:active,
+  &:focus {
+    color: $blue-800;
+    text-decoration: underline;
+    background-color: transparent;
+    border-color: transparent;
   }
+}
 
-  &.btn-primary-hover-link {
-    color: inherit;
+.btn-link.btn-secondary-hover-link {
+  color: $gl-text-color-secondary;
 
-    &:hover,
-    &:active,
-    &:focus {
-      color: $gl-link-color;
-      text-decoration: none;
-    }
+  &:hover,
+  &:active,
+  &:focus {
+    color: $gl-link-color;
+    text-decoration: none;
+  }
+}
+
+.btn-link.btn-primary-hover-link {
+  color: inherit;
+
+  &:hover,
+  &:active,
+  &:focus {
+    color: $gl-link-color;
+    text-decoration: none;
   }
 }
 
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index 40cdf7d1c35..3af8d80daab 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -203,10 +203,6 @@
   .popover-content {
     padding: 0;
   }
-
-  .btn-link {
-    padding: 0;
-  }
 }
 
 .milestone-popover-body {
diff --git a/app/views/shared/milestones/_deprecation_message.html.haml b/app/views/shared/milestones/_deprecation_message.html.haml
index 39200d0bc62..4a8f90937ea 100644
--- a/app/views/shared/milestones/_deprecation_message.html.haml
+++ b/app/views/shared/milestones/_deprecation_message.html.haml
@@ -2,8 +2,8 @@
   .banner-graphic= image_tag 'illustrations/milestone_removing-page.svg'
   .banner-body.prepend-left-10.append-right-10
     %h5.banner-title.prepend-top-0= _('This page will be removed in a future release.')
-    %p.banner-text= _('Use group milestones to manage issues from multiple projects in the same milestone.')
-    = button_tag _('Promote these project milestones into a group milestone.'), class: 'btn-link js-popover-link text-align-left milestone-banner-link'
+    %p.milestone-banner-text= _('Use group milestones to manage issues from multiple projects in the same milestone.')
+    = button_tag _('Promote these project milestones into a group milestone.'), class: 'btn btn-link js-popover-link text-align-left milestone-banner-link'
     .milestone-banner-buttons.prepend-top-20= link_to _('Learn more'), help_page_url('user/project/milestones/index', anchor: 'promoting-project-milestones-to-group-milestones'), class: 'btn btn-default', target: '_blank'
 
   %template.js-milestone-deprecation-message-template
@@ -11,4 +11,4 @@
       %ol.milestone-popover-instructions-list.append-bottom-0
         %li= _('Click any <strong>project name</strong> in the project list below to navigate to the project milestone.').html_safe
         %li= _('Click the <strong>Promote</strong> button in the top right corner to promote it to a group milestone.').html_safe
-    .milestone-popover-footer= link_to _('Learn more'), help_page_url('user/project/milestones/index', anchor: 'promoting-project-milestones-to-group-milestones'), class: 'btn-link prepend-left-0', target: '_blank'
+    .milestone-popover-footer= link_to _('Learn more'), help_page_url('user/project/milestones/index', anchor: 'promoting-project-milestones-to-group-milestones'), class: 'btn btn-link prepend-left-0', target: '_blank'