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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
6a136be1
Commit
6a136be1
authored
Jun 07, 2018
by
Jose Ivan Vargas
Committed by
Clement Ho
Jun 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE backport for the card class changes
parent
03972531
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
app/assets/stylesheets/pages/settings.scss
app/assets/stylesheets/pages/settings.scss
+7
-3
app/views/projects/services/prometheus/_configuration_banner.html.haml
...jects/services/prometheus/_configuration_banner.html.haml
+1
-1
app/views/projects/services/prometheus/_help.html.haml
app/views/projects/services/prometheus/_help.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/settings.scss
View file @
6a136be1
...
@@ -127,12 +127,16 @@
...
@@ -127,12 +127,16 @@
color
:
$gl-danger
;
color
:
$gl-danger
;
}
}
.service-settings
.form-control-label
{
.service-settings
{
padding-top
:
0
;
input
[
type
=
"radio"
],
input
[
type
=
"checkbox"
]
{
margin-top
:
10px
;
}
}
}
.integration-settings-form
{
.integration-settings-form
{
.card.card-body
{
.card.card-body
,
.info-well
{
padding
:
$gl-padding
/
2
;
padding
:
$gl-padding
/
2
;
box-shadow
:
none
;
box-shadow
:
none
;
}
}
...
...
app/views/projects/services/prometheus/_configuration_banner.html.haml
View file @
6a136be1
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
=
s_
(
'PrometheusService|Auto configuration'
)
=
s_
(
'PrometheusService|Auto configuration'
)
-
if
service
.
manual_configuration?
-
if
service
.
manual_configuration?
.well
.
info-
well
=
s_
(
'PrometheusService|To enable the installation of Prometheus on your clusters, deactivate the manual configuration below'
)
=
s_
(
'PrometheusService|To enable the installation of Prometheus on your clusters, deactivate the manual configuration below'
)
-
else
-
else
.container-fluid
.container-fluid
...
...
app/views/projects/services/prometheus/_help.html.haml
View file @
6a136be1
...
@@ -5,5 +5,5 @@
...
@@ -5,5 +5,5 @@
=
s_
(
'PrometheusService|Manual configuration'
)
=
s_
(
'PrometheusService|Manual configuration'
)
-
unless
@service
.
editable?
-
unless
@service
.
editable?
.
card
.
info-well
=
s_
(
'PrometheusService|To enable manual configuration, uninstall Prometheus from your clusters'
)
=
s_
(
'PrometheusService|To enable manual configuration, uninstall Prometheus from your clusters'
)
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