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
9bdd1130
Commit
9bdd1130
authored
Jun 29, 2017
by
Tim Zallmann
Committed by
Annabel Dunstone Gray
Jun 29, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Select branch dropdown is too close to branch name"
parent
02299efa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
18 deletions
+25
-18
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+6
-0
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+19
-18
No files found.
app/assets/stylesheets/pages/tree.scss
View file @
9bdd1130
.tree-holder
{
.tree-holder
{
.nav-block
{
.nav-block
{
margin
:
10px
0
;
margin
:
10px
0
;
...
@@ -15,6 +16,11 @@
...
@@ -15,6 +16,11 @@
.btn-group
{
.btn-group
{
margin-left
:
10px
;
margin-left
:
10px
;
}
}
.control
{
float
:
left
;
margin-left
:
10px
;
}
}
}
.tree-ref-holder
{
.tree-ref-holder
{
...
...
app/views/projects/commits/show.html.haml
View file @
9bdd1130
...
@@ -8,27 +8,28 @@
...
@@ -8,27 +8,28 @@
=
render
"head"
=
render
"head"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.row-content-block.second-block.content-component-block.flex-container-block
.tree-holder
.tree-ref-holder
.nav-block
=
render
'shared/ref_switcher'
,
destination:
'commits'
.tree-ref-container
.tree-ref-holder
=
render
'shared/ref_switcher'
,
destination:
'commits'
%ul
.breadcrumb.repo-breadcrumb
=
commits_breadcrumbs
.tree-controls.hidden-xs.hidden-sm
-
if
@merge_request
.
present?
.control
=
link_to
_
(
"View open merge request"
),
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'btn'
-
elsif
create_mr_button?
(
@repository
.
root_ref
,
@ref
)
.control
=
link_to
_
(
"Create merge request"
),
create_mr_path
(
@repository
.
root_ref
,
@ref
),
class:
'btn btn-success'
%ul
.breadcrumb.repo-breadcrumb
=
commits_breadcrumbs
.block-controls.hidden-xs.hidden-sm
-
if
@merge_request
.
present?
.control
.control
=
link_to
_
(
"View open merge request"
),
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'btn'
=
form_tag
(
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@id
),
method: :get
,
class:
'commits-search-form'
)
do
-
elsif
create_mr_button?
(
@repository
.
root_ref
,
@ref
)
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
_
(
'Filter by commit message'
),
id:
'commits-search'
,
class:
'form-control search-text-input input-short'
,
spellcheck:
false
}
.control
.control
=
link_to
_
(
"Create merge request"
),
create_mr_path
(
@repository
.
root_ref
,
@ref
),
class:
'btn btn-success'
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
rss_url_options
),
title:
_
(
"Commits feed"
),
class:
'btn'
do
=
icon
(
"rss"
)
.control
=
form_tag
(
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@id
),
method: :get
,
class:
'commits-search-form'
)
do
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
_
(
'Filter by commit message'
),
id:
'commits-search'
,
class:
'form-control search-text-input input-short'
,
spellcheck:
false
}
.control
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
rss_url_options
),
title:
_
(
"Commits feed"
),
class:
'btn'
do
=
icon
(
"rss"
)
%div
{
id:
dom_id
(
@project
)
}
%div
{
id:
dom_id
(
@project
)
}
%ol
#commits-list
.list-unstyled.content_list
%ol
#commits-list
.list-unstyled.content_list
...
...
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