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
dc9ef9ed
Commit
dc9ef9ed
authored
May 25, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix branches panel at smaller screen sizes
parent
cb868f41
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/assets/stylesheets/bootstrap_migration.scss
app/assets/stylesheets/bootstrap_migration.scss
+4
-0
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+2
-2
No files found.
app/assets/stylesheets/bootstrap_migration.scss
View file @
dc9ef9ed
...
...
@@ -131,6 +131,10 @@ table {
}
.card
{
.card-title
{
margin-bottom
:
0
;
}
&
.card-without-border
{
@extend
.border-0
;
}
...
...
app/views/projects/branches/_branch.html.haml
View file @
dc9ef9ed
...
...
@@ -28,7 +28,7 @@
=
s_
(
'Branches|Cant find HEAD commit for this branch'
)
-
if
branch
.
name
!=
@repository
.
root_ref
.divergence-graph.d-none.d-
sm
-block
{
title:
s_
(
'
%
{
number_commits_behind
}
commits
behind
%
{
default_branch
},
%
{
number_commits_ahead
}
commits
ahead
'
)
%
{
number_commits_behind:
diverging_count_label
(
number_commits_behind
),
.divergence-graph.d-none.d-
md
-block
{
title:
s_
(
'
%
{
number_commits_behind
}
commits
behind
%
{
default_branch
},
%
{
number_commits_ahead
}
commits
ahead
'
)
%
{
number_commits_behind:
diverging_count_label
(
number_commits_behind
),
default_branch:
@repository
.
root_ref
,
number_commits_ahead:
diverging_count_label
(
number_commits_ahead
)
}
}
.graph-side
...
...
@@ -39,7 +39,7 @@
.bar.bar-ahead
{
style:
"width: #{number_commits_ahead * bar_graph_width_factor}%"
}
%span
.count.count-ahead
=
diverging_count_label
(
number_commits_ahead
)
.controls.d-none.d-
sm
-block
<
.controls.d-none.d-
md
-block
<
-
if
merge_project
&&
create_mr_button?
(
@repository
.
root_ref
,
branch
.
name
)
=
link_to
create_mr_path
(
@repository
.
root_ref
,
branch
.
name
),
class:
'btn btn-default'
do
=
_
(
'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