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
e490e481
Commit
e490e481
authored
Nov 13, 2019
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update cluster alert warning component design
parent
bd3aa45c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
8 deletions
+15
-8
app/views/clusters/clusters/_banner.html.haml
app/views/clusters/clusters/_banner.html.haml
+10
-8
changelogs/unreleased/35145-cluster-alert-warning-is-using-wrong-padding.yml
...ed/35145-cluster-alert-warning-is-using-wrong-padding.yml
+5
-0
No files found.
app/views/clusters/clusters/_banner.html.haml
View file @
e490e481
...
...
@@ -6,17 +6,19 @@
%span
.spinner.spinner-dark.spinner-sm
{
'aria-label'
:
'Loading'
}
%span
.prepend-left-4
=
s_
(
'ClusterIntegration|Kubernetes cluster is being created...'
)
.hidden.row.js-cluster-api-unreachable.bs-callout.bs-callout-warning
{
role:
'alert'
}
.col-11
.hidden.row.js-cluster-api-unreachable.gl-alert.gl-alert-warning
{
role:
'alert'
}
=
sprite_icon
(
'warning'
,
size:
16
,
css_class:
'gl-icon gl-alert-icon gl-alert-icon-no-title'
)
%button
.js-close-banner.gl-alert-dismiss
{
type:
'button'
,
'aria-label'
=>
_
(
'Dismiss'
)
}
=
sprite_icon
(
'close'
,
size:
16
,
css_class:
'gl-icon'
)
.gl-alert-body
=
s_
(
'ClusterIntegration|Your cluster API is unreachable. Please ensure your API URL is correct.'
)
.col-1.p-0
%button
.js-close-banner.close.cluster-application-banner-close.h-100.m-0
=
"×"
.hidden.js-cluster-authentication-failure.row.js-cluster-api-unreachable.bs-callout.bs-callout-warning
{
role:
'alert'
}
.col-11
.hidden.js-cluster-authentication-failure.js-cluster-api-unreachable.gl-alert.gl-alert-warning
{
role:
'alert'
}
=
sprite_icon
(
'warning'
,
size:
16
,
css_class:
'gl-icon gl-alert-icon gl-alert-icon-no-title'
)
%button
.js-close-banner.gl-alert-dismiss
{
type:
'button'
,
'aria-label'
=>
_
(
'Dismiss'
)
}
=
sprite_icon
(
'close'
,
size:
16
,
css_class:
'gl-icon'
)
.gl-alert-body
=
s_
(
'ClusterIntegration|There was a problem authenticating with your cluster. Please ensure your CA Certificate and Token are valid.'
)
.col-1.p-0
%button
.js-close-banner.close.cluster-application-banner-close.h-100.m-0
=
"×"
.hidden.js-cluster-success.bs-callout.bs-callout-success
{
role:
'alert'
}
=
s_
(
"ClusterIntegration|Kubernetes cluster was successfully created."
)
changelogs/unreleased/35145-cluster-alert-warning-is-using-wrong-padding.yml
0 → 100644
View file @
e490e481
---
title
:
Update padding for cluster alert warning
merge_request
:
20036
author
:
George Tsiolis
type
:
fixed
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