Commit a96760d0 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'lm-change-headers-ops-settings' into 'master'

Updates headers in ops settings page

See merge request gitlab-org/gitlab!25641
parents 33ad59e2 6fe79e85
...@@ -55,9 +55,9 @@ export default { ...@@ -55,9 +55,9 @@ export default {
<template> <template>
<section id="grafana" class="settings no-animate js-grafana-integration"> <section id="grafana" class="settings no-animate js-grafana-integration">
<div class="settings-header"> <div class="settings-header">
<h4 class="js-section-header"> <h3 class="js-section-header h4">
{{ s__('GrafanaIntegration|Grafana Authentication') }} {{ s__('GrafanaIntegration|Grafana Authentication') }}
</h4> </h3>
<gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button> <gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button>
<p class="js-section-sub-header"> <p class="js-section-sub-header">
{{ s__('GrafanaIntegration|Embed Grafana charts in GitLab issues.') }} {{ s__('GrafanaIntegration|Embed Grafana charts in GitLab issues.') }}
......
...@@ -33,9 +33,9 @@ export default { ...@@ -33,9 +33,9 @@ export default {
<template> <template>
<section class="settings no-animate"> <section class="settings no-animate">
<div class="settings-header"> <div class="settings-header">
<h4 class="js-section-header"> <h3 class="js-section-header h4">
{{ s__('ExternalMetrics|External Dashboard') }} {{ s__('ExternalMetrics|External Dashboard') }}
</h4> </h3>
<gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button> <gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button>
<p class="js-section-sub-header"> <p class="js-section-sub-header">
{{ {{
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%section.settings.no-animate.js-error-tracking-settings %section.settings.no-animate.js-error-tracking-settings
.settings-header .settings-header
%h4 %h3{ :class => "h4" }
= _('Error Tracking') = _('Error Tracking')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.js-settings-toggle{ type: 'button' }
= _('Expand') = _('Expand')
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%section.settings.no-animate.qa-incident-management-settings %section.settings.no-animate.qa-incident-management-settings
.settings-header .settings-header
%h4= _('Incidents') %h3{ :class => "h4" }= _('Incidents')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.js-settings-toggle{ type: 'button' }
= _('Expand') = _('Expand')
%p %p
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
%section.settings.border-0.no-animate %section.settings.border-0.no-animate
.settings-header{ :class => "border-top" } .settings-header{ :class => "border-top" }
%h4 %h3{ :class => "h4" }
= _("Jaeger tracing") = _("Jaeger tracing")
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.js-settings-toggle{ type: 'button' }
= _('Expand') = _('Expand')
......
...@@ -35,7 +35,7 @@ describe 'Projects > Settings > For a forked project', :js do ...@@ -35,7 +35,7 @@ describe 'Projects > Settings > For a forked project', :js do
end end
it 'renders form for incident management' do it 'renders form for incident management' do
expect(page).to have_selector('h4', text: 'Incidents') expect(page).to have_selector('h3', text: 'Incidents')
end end
it 'sets correct default values' do it 'sets correct default values' do
......
...@@ -8,13 +8,13 @@ exports[`grafana integration component default state to match the default snapsh ...@@ -8,13 +8,13 @@ exports[`grafana integration component default state to match the default snapsh
<div <div
class="settings-header" class="settings-header"
> >
<h4 <h3
class="js-section-header" class="js-section-header h4"
> >
Grafana Authentication Grafana Authentication
</h4> </h3>
<gl-button-stub <gl-button-stub
class="js-settings-toggle" class="js-settings-toggle"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment