Download as
Browse Code »

Commit 86e25595c8766a41b31fef61c7bde6cf98826641

Authored by Dmitriy Zaporozhets
1 parent aff7ac37
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Fix btn-group align 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 3 changed files with 12 additions and 2 deletions   Show diff stats
app/assets/stylesheets/generic/buttons.scss
  Diff comments   View file @86e2559
@@ -177,5 +177,15 @@ @@ -177,5 +177,15 @@
177 } 177 }
178 } 178 }
179 179
  180 +.btn-group {
  181 + &.btn-grouped {
  182 + margin-right: 7px;
  183 + float: left;
  184 + &:last-child {
  185 + margin-right: 0px;
  186 + }
  187 + }
  188 +}
  189 +
180 .btn-group-small > .btn { @extend .btn.btn-small; } 190 .btn-group-small > .btn { @extend .btn.btn-small; }
181 .btn-group-tiny > .btn { @extend .btn.btn-tiny; } 191 .btn-group-tiny > .btn { @extend .btn.btn-tiny; }
app/views/projects/branches/_branch.html.haml
  Diff comments   View file @86e2559
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 %i.icon-lock 10 %i.icon-lock
11 .pull-right 11 .pull-right
12 - if can?(current_user, :download_code, @project) 12 - if can?(current_user, :download_code, @project)
13 - = render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'grouped btn-group-small' 13 + = render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'btn-grouped btn-group-small'
14 - if branch.name != @repository.root_ref 14 - if branch.name != @repository.root_ref
15 = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-small', method: :post, title: "Compare" do 15 = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-small', method: :post, title: "Compare" do
16 %i.icon-copy 16 %i.icon-copy
app/views/projects/tags/_tag.html.haml
  Diff comments   View file @86e2559
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 15
16 %span.pull-right 16 %span.pull-right
17 - if can? current_user, :download_code, @project 17 - if can? current_user, :download_code, @project
18 - = render 'projects/repositories/download_archive', ref: tag.name, btn_class: 'grouped btn-group-small' 18 + = render 'projects/repositories/download_archive', ref: tag.name, btn_class: 'btn-grouped btn-group-small'
19 - if can?(current_user, :admin_project, @project) 19 - if can?(current_user, :admin_project, @project)
20 = link_to project_tag_path(@project, tag.name), class: 'btn btn-small remove-row grouped', method: :delete, data: { confirm: 'Removed tag cannot be restored. Are you sure?'}, remote: true do 20 = link_to project_tag_path(@project, tag.name), class: 'btn btn-small remove-row grouped', method: :delete, data: { confirm: 'Removed tag cannot be restored. Are you sure?'}, remote: true do
21 %i.icon-trash 21 %i.icon-trash