diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss index 68d9694905ad5aea67e72fd222a9d70ef5b4f0fd..c509bf121bc1ecf88d8945425aa9f37a1c8351d1 100644 --- a/app/assets/stylesheets/pages/cycle_analytics.scss +++ b/app/assets/stylesheets/pages/cycle_analytics.scss @@ -41,15 +41,6 @@ width: 20%; } - .fa, - svg { - color: $cycle-analytics-light-gray; - - &:hover { - color: $gl-text-color; - } - } - .stage-header { width: 20.5%; } diff --git a/app/assets/stylesheets/pages/dev_ops_report.scss b/app/assets/stylesheets/pages/dev_ops_report.scss index a6bc9b9332b5624afadfd6678c49190bf5fd1b9a..871cd9c4f029ac3c9d52486f01b8e8cc3be9e312 100644 --- a/app/assets/stylesheets/pages/dev_ops_report.scss +++ b/app/assets/stylesheets/pages/dev_ops_report.scss @@ -25,6 +25,10 @@ $space-between-cards: 8px; margin-left: 8px; font-weight: $gl-font-weight-normal; + .devops-header-icon { + vertical-align: px-to-rem(-$gl-spacing-scale-1); + } + a { font-size: 18px; color: $gl-text-color-secondary; diff --git a/app/views/admin/dev_ops_report/show.html.haml b/app/views/admin/dev_ops_report/show.html.haml index 290310fb1c7d35959f49623f387b63bd830e7198..1892557d0d6348363e26a2481e617f57438156b9 100644 --- a/app/views/admin/dev_ops_report/show.html.haml +++ b/app/views/admin/dev_ops_report/show.html.haml @@ -19,7 +19,7 @@ = _('DevOps') %br = _('Score') - = link_to sprite_icon('question-o'), help_page_path('user/admin_area/analytics/dev_ops_report') + = link_to sprite_icon('question-o', css_class: 'devops-header-icon'), help_page_path('user/admin_area/analytics/dev_ops_report') .devops-cards.board-card-container - @metric.cards.each do |card| diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml index 05ad288da4f5e8f519a7e77ec4b71f6b80bdc1fe..d7e10efc3b1699143ec73d9384500e7829ed7ead 100644 --- a/app/views/projects/cycle_analytics/show.html.haml +++ b/app/views/projects/cycle_analytics/show.html.haml @@ -41,22 +41,22 @@ %span.stage-name.font-weight-bold {{ s__('ProjectLifecycle|Stage') }} %span.has-tooltip{ "data-placement" => "top", title: _("The phase of the development lifecycle."), "aria-hidden" => "true" } - = sprite_icon('question-o') + = sprite_icon('question-o', css_class: 'gl-text-gray-500') %li.median-header %span.stage-name.font-weight-bold {{ __('Median') }} %span.has-tooltip{ "data-placement" => "top", title: _("The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6."), "aria-hidden" => "true" } - = sprite_icon('question-o') + = sprite_icon('question-o', css_class: 'gl-text-gray-500') %li.event-header.pl-3 %span.stage-name.font-weight-bold {{ currentStage ? __(currentStage.legend) : __('Related Issues') }} %span.has-tooltip{ "data-placement" => "top", title: _("The collection of events added to the data gathered for that stage."), "aria-hidden" => "true" } - = sprite_icon('question-o') + = sprite_icon('question-o', css_class: 'gl-text-gray-500') %li.total-time-header.pr-5.text-right %span.stage-name.font-weight-bold {{ __('Time') }} %span.has-tooltip{ "data-placement" => "top", title: _("The time taken by each data entry gathered by that stage."), "aria-hidden" => "true" } - = sprite_icon('question-o') + = sprite_icon('question-o', css_class: 'gl-text-gray-500') .stage-panel-body %nav.stage-nav %ul diff --git a/changelogs/unreleased/225958-replace-fa-question-circle-icons-with-gitlab-svg-question-icon.yml b/changelogs/unreleased/225958-replace-fa-question-circle-icons-with-gitlab-svg-question-icon.yml new file mode 100644 index 0000000000000000000000000000000000000000..fe5c57d85238d0b3cf825e303f4a49b48af16548 --- /dev/null +++ b/changelogs/unreleased/225958-replace-fa-question-circle-icons-with-gitlab-svg-question-icon.yml @@ -0,0 +1,5 @@ +--- +title: Replace fa-question-circle icons with GitLab SVG question-o icon +merge_request: 41970 +author: +type: changed