diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-05-29 17:50:03 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-05-29 17:50:03 +0300 |
| commit | a6b828ca0c7ce580f684ad3a7a772f76c3a93bc9 (patch) | |
| tree | 53da7fa73ea4e9ad68c798d58e9295f3c6007df0 | |
| parent | 57fbd614a56592870300108ff8f94385fed6c7df (diff) | |
| parent | dc9ef9ed122a8367cf04b54025a0335e4702a2b0 (diff) | |
Merge branch 'branches-fixes' into 'master'
Fix branches panel at smaller screen sizes
See merge request gitlab-org/gitlab-ce!19157
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 3b7ee5c73e6..2f3e14bb6c5 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -131,6 +131,10 @@ table { } .card { + .card-title { + margin-bottom: 0; + } + &.card-without-border { @extend .border-0; } diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 5b1f2d8953b..f641d7bc51a 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -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') |