Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4f8869c6
Commit
4f8869c6
authored
Jan 21, 2021
by
Yogi
Committed by
David O'Regan
Jan 21, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix alignment and font issues in project operations settings page
parent
546e8436
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
20 additions
and
19 deletions
+20
-19
app/assets/javascripts/grafana_integration/components/grafana_integration.vue
...ts/grafana_integration/components/grafana_integration.vue
+2
-2
app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue
...incidents_settings/components/incidents_settings_tabs.vue
+1
-1
app/assets/javascripts/operation_settings/components/metrics_settings.vue
...cripts/operation_settings/components/metrics_settings.vue
+2
-2
app/views/projects/settings/operations/_alert_management.html.haml
.../projects/settings/operations/_alert_management.html.haml
+1
-1
app/views/projects/settings/operations/_error_tracking.html.haml
...ws/projects/settings/operations/_error_tracking.html.haml
+1
-1
app/views/projects/settings/operations/_tracing.html.haml
app/views/projects/settings/operations/_tracing.html.haml
+1
-1
changelogs/unreleased/yo-fix-alertpage-alignment.yml
changelogs/unreleased/yo-fix-alertpage-alignment.yml
+5
-0
ee/app/assets/javascripts/status_page_settings/components/settings_form.vue
...scripts/status_page_settings/components/settings_form.vue
+1
-1
ee/spec/frontend/status_page_settings/__snapshots__/settings_form_spec.js.snap
...us_page_settings/__snapshots__/settings_form_spec.js.snap
+1
-3
spec/features/alerts_settings/user_views_alerts_settings_spec.rb
...atures/alerts_settings/user_views_alerts_settings_spec.rb
+1
-1
spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap
...components/__snapshots__/grafana_integration_spec.js.snap
+3
-3
spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap
...onents/__snapshots__/incidents_settings_tabs_spec.js.snap
+1
-3
No files found.
app/assets/javascripts/grafana_integration/components/grafana_integration.vue
View file @
4f8869c6
...
@@ -54,9 +54,9 @@ export default {
...
@@ -54,9 +54,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"
>
<h
3
class=
"js-section-header h4
"
>
<h
4
class=
"js-section-header
"
>
{{
s__
(
'
GrafanaIntegration|Grafana authentication
'
)
}}
{{
s__
(
'
GrafanaIntegration|Grafana authentication
'
)
}}
</h
3
>
</h
4
>
<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.
'
)
}}
...
...
app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue
View file @
4f8869c6
...
@@ -26,7 +26,7 @@ export default {
...
@@ -26,7 +26,7 @@ export default {
class=
"settings no-animate qa-incident-management-settings"
class=
"settings no-animate qa-incident-management-settings"
>
>
<div
class=
"settings-header"
>
<div
class=
"settings-header"
>
<h4
ref=
"sectionHeader"
class=
"gl-my-3! gl-py-1"
>
<h4
ref=
"sectionHeader"
>
{{
$options
.
i18n
.
headerText
}}
{{
$options
.
i18n
.
headerText
}}
</h4>
</h4>
<gl-button
ref=
"toggleBtn"
class=
"js-settings-toggle"
>
{{
<gl-button
ref=
"toggleBtn"
class=
"js-settings-toggle"
>
{{
...
...
app/assets/javascripts/operation_settings/components/metrics_settings.vue
View file @
4f8869c6
...
@@ -31,9 +31,9 @@ export default {
...
@@ -31,9 +31,9 @@ export default {
<
template
>
<
template
>
<section
class=
"settings no-animate"
>
<section
class=
"settings no-animate"
>
<div
class=
"settings-header"
>
<div
class=
"settings-header"
>
<h
3
class=
"js-section-header h4
"
>
<h
4
class=
"js-section-header
"
>
{{
s__
(
'
MetricsSettings|Metrics dashboard
'
)
}}
{{
s__
(
'
MetricsSettings|Metrics dashboard
'
)
}}
</h
3
>
</h
4
>
<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__
(
'
MetricsSettings|Manage Metrics Dashboard settings.
'
)
}}
{{
s__
(
'
MetricsSettings|Manage Metrics Dashboard settings.
'
)
}}
...
...
app/views/projects/settings/operations/_alert_management.html.haml
View file @
4f8869c6
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
%section
.settings.no-animate
#js-alert-management-settings
{
class:
(
'expanded'
if
expanded
)
}
%section
.settings.no-animate
#js-alert-management-settings
{
class:
(
'expanded'
if
expanded
)
}
.settings-header
.settings-header
%h
3
{
:class
=>
"h4"
}
%h
4
=
_
(
'Alerts'
)
=
_
(
'Alerts'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.js-settings-toggle
{
type:
'button'
}
=
_
(
'Expand'
)
=
_
(
'Expand'
)
...
...
app/views/projects/settings/operations/_error_tracking.html.haml
View file @
4f8869c6
...
@@ -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
%h
3
{
:class
=>
"h4"
}
%h
4
=
_
(
'Error tracking'
)
=
_
(
'Error tracking'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.js-settings-toggle
{
type:
'button'
}
=
_
(
'Expand'
)
=
_
(
'Expand'
)
...
...
app/views/projects/settings/operations/_tracing.html.haml
View file @
4f8869c6
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
%section
.settings.border-0.no-animate
%section
.settings.border-0.no-animate
.settings-header
{
:class
=>
"border-top"
}
.settings-header
{
:class
=>
"border-top"
}
%h
3
{
:class
=>
"h4"
}
%h
4
=
_
(
"Jaeger tracing"
)
=
_
(
"Jaeger tracing"
)
%button
.btn.gl-button.js-settings-toggle
{
type:
'button'
}
%button
.btn.gl-button.js-settings-toggle
{
type:
'button'
}
=
_
(
'Expand'
)
=
_
(
'Expand'
)
...
...
changelogs/unreleased/yo-fix-alertpage-alignment.yml
0 → 100644
View file @
4f8869c6
---
title
:
Fix alignment and font issues in project operations settings page
merge_request
:
51825
author
:
Yogi (@yo)
type
:
fixed
ee/app/assets/javascripts/status_page_settings/components/settings_form.vue
View file @
4f8869c6
...
@@ -75,7 +75,7 @@ export default {
...
@@ -75,7 +75,7 @@ export default {
<
template
>
<
template
>
<section
id=
"status-page"
class=
"settings no-animate js-status-page-settings"
>
<section
id=
"status-page"
class=
"settings no-animate js-status-page-settings"
>
<div
class=
"settings-header"
>
<div
class=
"settings-header"
>
<h4
ref=
"sectionHeader"
class=
"gl-my-3! gl-py-1"
>
<h4
ref=
"sectionHeader"
>
{{
$options
.
i18n
.
headerText
}}
{{
$options
.
i18n
.
headerText
}}
</h4>
</h4>
<gl-button
ref=
"toggleBtn"
class=
"js-settings-toggle"
>
{{
<gl-button
ref=
"toggleBtn"
class=
"js-settings-toggle"
>
{{
...
...
ee/spec/frontend/status_page_settings/__snapshots__/settings_form_spec.js.snap
View file @
4f8869c6
...
@@ -8,9 +8,7 @@ exports[`Status Page settings form default state should match the default snapsh
...
@@ -8,9 +8,7 @@ exports[`Status Page settings form default state should match the default snapsh
<div
<div
class="settings-header"
class="settings-header"
>
>
<h4
<h4>
class="gl-my-3! gl-py-1"
>
Status page
Status page
...
...
spec/features/alerts_settings/user_views_alerts_settings_spec.rb
View file @
4f8869c6
...
@@ -25,7 +25,7 @@ RSpec.describe 'Alert integrations settings form', :js do
...
@@ -25,7 +25,7 @@ RSpec.describe 'Alert integrations settings form', :js do
it
'shows the alerts setting form title'
do
it
'shows the alerts setting form title'
do
page
.
within
(
'#js-alert-management-settings'
)
do
page
.
within
(
'#js-alert-management-settings'
)
do
expect
(
find
(
'h
3
'
)).
to
have_content
(
'Alerts'
)
expect
(
find
(
'h
4
'
)).
to
have_content
(
'Alerts'
)
end
end
end
end
...
...
spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap
View file @
4f8869c6
...
@@ -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"
>
>
<h
3
<h
4
class="js-section-header
h4
"
class="js-section-header"
>
>
Grafana authentication
Grafana authentication
</h
3
>
</h
4
>
<gl-button-stub
<gl-button-stub
buttontextclasses=""
buttontextclasses=""
...
...
spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap
View file @
4f8869c6
...
@@ -9,9 +9,7 @@ exports[`IncidentsSettingTabs should render the component 1`] = `
...
@@ -9,9 +9,7 @@ exports[`IncidentsSettingTabs should render the component 1`] = `
<div
<div
class="settings-header"
class="settings-header"
>
>
<h4
<h4>
class="gl-my-3! gl-py-1"
>
Incidents
Incidents
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment