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
Boxiang Sun
gitlab-ce
Commits
c82f8560
Commit
c82f8560
authored
Aug 14, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix inconsistent spacing for edit buttons on issues and merge request page
parent
2857ed5f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
app/assets/stylesheets/new_nav.scss
app/assets/stylesheets/new_nav.scss
+1
-0
app/views/projects/merge_requests/_nav_btns.html.haml
app/views/projects/merge_requests/_nav_btns.html.haml
+1
-1
No files found.
app/assets/stylesheets/new_nav.scss
View file @
c82f8560
...
@@ -403,6 +403,7 @@ header.navbar-gitlab-new {
...
@@ -403,6 +403,7 @@ header.navbar-gitlab-new {
}
}
.breadcrumbs-extra
{
.breadcrumbs-extra
{
display
:
flex
;
flex
:
0
0
auto
;
flex
:
0
0
auto
;
margin-left
:
auto
;
margin-left
:
auto
;
}
}
...
...
app/views/projects/merge_requests/_nav_btns.html.haml
View file @
c82f8560
-
if
@can_bulk_update
-
if
@can_bulk_update
=
button_tag
"Edit Merge Requests"
,
class:
"btn js-bulk-update-toggle"
=
button_tag
"Edit Merge Requests"
,
class:
"btn
append-right-10
js-bulk-update-toggle"
-
if
merge_project
-
if
merge_project
=
link_to
new_merge_request_path
,
class:
"btn btn-new"
,
title:
"New merge request"
do
=
link_to
new_merge_request_path
,
class:
"btn btn-new"
,
title:
"New merge request"
do
New merge request
New merge request
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