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
52e0de81
Commit
52e0de81
authored
Mar 15, 2021
by
Yogi
Committed by
David O'Regan
Mar 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move from btn-success to btn-confirm in pages
parent
3a172309
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
app/views/projects/pages/_list.html.haml
app/views/projects/pages/_list.html.haml
+1
-1
app/views/projects/pages/_pages_settings.html.haml
app/views/projects/pages/_pages_settings.html.haml
+1
-1
app/views/projects/pages/show.html.haml
app/views/projects/pages/show.html.haml
+1
-1
changelogs/unreleased/btn-confirm-project-pages.yml
changelogs/unreleased/btn-confirm-project-pages.yml
+5
-0
No files found.
app/views/projects/pages/_list.html.haml
View file @
52e0de81
...
...
@@ -21,7 +21,7 @@
%span
.badge.badge-danger
=
s_
(
'GitLabPages|Expired'
)
%div
=
link_to
s_
(
'GitLabPages|Edit'
),
project_pages_domain_path
(
@project
,
domain
),
class:
"btn gl-button btn-sm btn-grouped btn-
success
btn-inverted"
=
link_to
s_
(
'GitLabPages|Edit'
),
project_pages_domain_path
(
@project
,
domain
),
class:
"btn gl-button btn-sm btn-grouped btn-
confirm
btn-inverted"
=
link_to
s_
(
'GitLabPages|Remove'
),
project_pages_domain_path
(
@project
,
domain
),
data:
{
confirm:
s_
(
'GitLabPages|Are you sure?'
)},
method: :delete
,
class:
"btn gl-button btn-danger btn-sm btn-grouped"
-
if
domain
.
needs_verification?
%li
.list-group-item.bs-callout-warning
...
...
app/views/projects/pages/_pages_settings.html.haml
View file @
52e0de81
...
...
@@ -11,4 +11,4 @@
=
s_
(
'GitLabPages|Force HTTPS (requires valid certificates)'
)
.gl-mt-3
=
f
.
submit
s_
(
'GitLabPages|Save'
),
class:
'btn btn-
success
gl-button'
=
f
.
submit
s_
(
'GitLabPages|Save'
),
class:
'btn btn-
confirm
gl-button'
app/views/projects/pages/show.html.haml
View file @
52e0de81
...
...
@@ -5,7 +5,7 @@
=
s_
(
'GitLabPages|Pages'
)
-
if
can?
(
current_user
,
:update_pages
,
@project
)
&&
(
Gitlab
.
config
.
pages
.
external_http
||
Gitlab
.
config
.
pages
.
external_https
)
=
link_to
new_project_pages_domain_path
(
@project
),
class:
'btn gl-button btn-
success
float-right'
,
title:
s_
(
'GitLabPages|New Domain'
)
do
=
link_to
new_project_pages_domain_path
(
@project
),
class:
'btn gl-button btn-
confirm
float-right'
,
title:
s_
(
'GitLabPages|New Domain'
)
do
=
s_
(
'GitLabPages|New Domain'
)
%p
.light
...
...
changelogs/unreleased/btn-confirm-project-pages.yml
0 → 100644
View file @
52e0de81
---
title
:
Move from btn-success to btn-confirm in pages directory
merge_request
:
56348
author
:
Yogi (@yo)
type
:
changed
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