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
2d4d7a8b
Commit
2d4d7a8b
authored
Mar 04, 2021
by
Yogi
Committed by
Kushal Pandya
Mar 04, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move from btn-success to btn-confirm in shared/wikis directory
parent
37d862c3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
app/views/shared/wikis/_form.html.haml
app/views/shared/wikis/_form.html.haml
+2
-2
app/views/shared/wikis/_main_links.html.haml
app/views/shared/wikis/_main_links.html.haml
+1
-1
changelogs/unreleased/btn-confirm-shared-wikis.yml
changelogs/unreleased/btn-confirm-shared-wikis.yml
+5
-0
No files found.
app/views/shared/wikis/_form.html.haml
View file @
2d4d7a8b
...
...
@@ -70,10 +70,10 @@
.form-actions
-
if
@page
&&
@page
.
persisted?
=
f
.
submit
_
(
"Save changes"
),
class:
'btn gl-button btn-
success
qa-save-changes-button js-wiki-btn-submit'
,
disabled:
'true'
=
f
.
submit
_
(
"Save changes"
),
class:
'btn gl-button btn-
confirm
qa-save-changes-button js-wiki-btn-submit'
,
disabled:
'true'
.float-right
=
link_to
_
(
"Cancel"
),
wiki_page_path
(
@wiki
,
@page
),
class:
'btn gl-button btn-cancel btn-default'
-
else
=
f
.
submit
s_
(
"Wiki|Create page"
),
class:
'btn-
success
gl-button btn qa-create-page-button rspec-create-page-button js-wiki-btn-submit'
,
disabled:
'true'
=
f
.
submit
s_
(
"Wiki|Create page"
),
class:
'btn-
confirm
gl-button btn qa-create-page-button rspec-create-page-button js-wiki-btn-submit'
,
disabled:
'true'
.float-right
=
link_to
_
(
"Cancel"
),
wiki_path
(
@wiki
),
class:
'btn gl-button btn-cancel btn-default'
app/views/shared/wikis/_main_links.html.haml
View file @
2d4d7a8b
...
...
@@ -2,5 +2,5 @@
=
link_to
wiki_page_path
(
@wiki
,
@page
,
action: :history
),
class:
"btn gl-button"
,
role:
"button"
,
data:
{
qa_selector:
'page_history_button'
}
do
=
s_
(
"Wiki|Page history"
)
-
if
can?
(
current_user
,
:create_wiki
,
@wiki
.
container
)
=
link_to
wiki_path
(
@wiki
,
action: :new
),
class:
"btn gl-button btn-
success btn-inverted
"
,
role:
"button"
,
data:
{
qa_selector:
'new_page_button'
}
do
=
link_to
wiki_path
(
@wiki
,
action: :new
),
class:
"btn gl-button btn-
confirm-secondary
"
,
role:
"button"
,
data:
{
qa_selector:
'new_page_button'
}
do
=
s_
(
"Wiki|New page"
)
changelogs/unreleased/btn-confirm-shared-wikis.yml
0 → 100644
View file @
2d4d7a8b
---
title
:
Move from btn-success to btn-confirm in shared/wikis directory
merge_request
:
55316
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