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
c2488f47
Commit
c2488f47
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 directory
parent
37d862c3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
5 deletions
+10
-5
app/views/shared/_confirm_fork_modal.html.haml
app/views/shared/_confirm_fork_modal.html.haml
+2
-2
app/views/shared/_new_project_item_select.html.haml
app/views/shared/_new_project_item_select.html.haml
+2
-2
app/views/shared/_recaptcha_form.html.haml
app/views/shared/_recaptcha_form.html.haml
+1
-1
changelogs/unreleased/btn-confirm-shared.yml
changelogs/unreleased/btn-confirm-shared.yml
+5
-0
No files found.
app/views/shared/_confirm_fork_modal.html.haml
View file @
c2488f47
...
...
@@ -8,5 +8,5 @@
.modal-body.p-3
%p
=
_
(
"You're not allowed to %{tag_start}edit%{tag_end} files in this project directly. Please fork this project, make your changes there, and submit a merge request."
)
%
{
tag_start:
''
,
tag_end:
''
}
.modal-footer
=
link_to
_
(
'Cancel'
),
'#'
,
class:
"
btn
btn-cancel"
,
"data-dismiss"
=>
"modal"
=
link_to
_
(
'Fork project'
),
fork_path
,
class:
'
btn btn-success
'
,
data:
{
qa_selector:
'fork_project_button'
},
method: :post
=
link_to
_
(
'Cancel'
),
'#'
,
class:
"
gl-button btn btn-default
btn-cancel"
,
"data-dismiss"
=>
"modal"
=
link_to
_
(
'Fork project'
),
fork_path
,
class:
'
gl-button btn btn-confirm
'
,
data:
{
qa_selector:
'fork_project_button'
},
method: :post
app/views/shared/_new_project_item_select.html.haml
View file @
c2488f47
-
if
any_projects?
(
@projects
)
.project-item-select-holder.btn-group.gl-ml-auto.gl-mr-auto.gl-py-3.gl-relative.gl-display-flex.gl-overflow-hidden
%a
.btn.gl-button.btn-
success
.new-project-item-link.block-truncated.qa-new-project-item-link
{
href:
''
,
data:
{
label:
local_assigns
[
:label
],
type:
local_assigns
[
:type
]
},
class:
"gl-m-0!"
}
%a
.btn.gl-button.btn-
confirm
.new-project-item-link.block-truncated.qa-new-project-item-link
{
href:
''
,
data:
{
label:
local_assigns
[
:label
],
type:
local_assigns
[
:type
]
},
class:
"gl-m-0!"
}
=
loading_icon
(
color:
'light'
)
=
project_select_tag
:project_path
,
class:
"project-item-select gl-absolute! gl-visibility-hidden"
,
data:
{
include_groups:
local_assigns
[
:include_groups
],
order_by:
'last_activity_at'
,
relative_path:
local_assigns
[
:path
],
with_shared:
local_assigns
[
:with_shared
],
include_projects_in_subgroups:
local_assigns
[
:include_projects_in_subgroups
]
},
with_feature_enabled:
local_assigns
[
:with_feature_enabled
]
%button
.btn.dropdown-toggle.btn-
success
.btn-md.gl-button.gl-dropdown-toggle.dropdown-toggle-split.new-project-item-select-button.qa-new-project-item-select-button.gl-p-0.gl-w-100
{
class:
"gl-m-0!"
,
'aria-label'
:
_
(
'Toggle project select'
)
}
%button
.btn.dropdown-toggle.btn-
confirm
.btn-md.gl-button.gl-dropdown-toggle.dropdown-toggle-split.new-project-item-select-button.qa-new-project-item-select-button.gl-p-0.gl-w-100
{
class:
"gl-m-0!"
,
'aria-label'
:
_
(
'Toggle project select'
)
}
=
sprite_icon
(
'chevron-down'
)
app/views/shared/_recaptcha_form.html.haml
View file @
c2488f47
...
...
@@ -20,4 +20,4 @@
-
if
has_submit
.row-content-block.footer-block
=
f
.
submit
_
(
"Submit %{humanized_resource_name}"
)
%
{
humanized_resource_name:
humanized_resource_name
},
class:
'
btn btn-success
'
=
f
.
submit
_
(
"Submit %{humanized_resource_name}"
)
%
{
humanized_resource_name:
humanized_resource_name
},
class:
'
gl-button btn btn-confirm
'
changelogs/unreleased/btn-confirm-shared.yml
0 → 100644
View file @
c2488f47
---
title
:
Move from btn-success to btn-confirm in shared directory
merge_request
:
55317
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