diff options
author | Enrique Alcantara <ealcantara@gitlab.com> | 2019-06-04 10:41:24 -0400 |
---|---|---|
committer | Dimitrie Hoekstra <dimitriehoekstra@gmail.com> | 2019-06-13 19:46:17 +0200 |
commit | b9cd89f6169b22521f978e95b12c84722f18f3cc (patch) | |
tree | 5f490b77775995b6ed852dbc6946cd10ac1c2477 | |
parent | adeb1bdbd8a21931d2c72235c8413013f0679033 (diff) | |
download | gitlab-ce-b9cd89f6169b22521f978e95b12c84722f18f3cc.tar.gz |
Cleanup deprecation message popover
-rw-r--r-- | app/assets/stylesheets/components/user_popover.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/milestone.scss | 21 | ||||
-rw-r--r-- | app/views/shared/milestones/_deprecation_message.html.haml | 1 |
3 files changed, 1 insertions, 25 deletions
diff --git a/app/assets/stylesheets/components/user_popover.scss b/app/assets/stylesheets/components/user_popover.scss deleted file mode 100644 index 2f33324bc60..00000000000 --- a/app/assets/stylesheets/components/user_popover.scss +++ /dev/null @@ -1,4 +0,0 @@ -.user-popover { - padding: $gl-padding-8; - line-height: $gl-line-height; -} diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss index 49608a3964f..00d84df1650 100644 --- a/app/assets/stylesheets/pages/milestone.scss +++ b/app/assets/stylesheets/pages/milestone.scss @@ -230,27 +230,6 @@ $status-box-line-height: 26px; background-color: $white-light; } -.milestone-deprecation-message { - .popover { - padding: 0; - } - - .popover-body, - .popover-content { - padding: 0; - } -} - -.milestone-popover-body { - padding: $gl-padding-8; - background-color: $gray-light; -} - -.milestone-popover-footer { - padding: $gl-padding-8 $gl-padding; - border-top: 1px solid $white-dark; -} - .milestone-popover-instructions-list { padding-left: 2em; diff --git a/app/views/shared/milestones/_deprecation_message.html.haml b/app/views/shared/milestones/_deprecation_message.html.haml index 4a8f90937ea..acd90fa9178 100644 --- a/app/views/shared/milestones/_deprecation_message.html.haml +++ b/app/views/shared/milestones/_deprecation_message.html.haml @@ -11,4 +11,5 @@ %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 + %hr.popover-hr .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' |