diff options
Diffstat (limited to 'app/views/tree')
-rw-r--r-- | app/views/tree/_blob_actions.html.haml | 10 | ||||
-rw-r--r-- | app/views/tree/_head.html.haml | 2 | ||||
-rw-r--r-- | app/views/tree/_tree.html.haml | 2 | ||||
-rw-r--r-- | app/views/tree/edit.html.haml | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/app/views/tree/_blob_actions.html.haml b/app/views/tree/_blob_actions.html.haml index 21334ea1f16..0bde968d0e6 100644 --- a/app/views/tree/_blob_actions.html.haml +++ b/app/views/tree/_blob_actions.html.haml @@ -1,12 +1,12 @@ .btn-group.tree-btn-group -# only show edit link for text files - if @tree.text? - = link_to "edit", edit_project_tree_path(@project, @id), class: "btn very_small", disabled: !allowed_tree_edit? - = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank" + = link_to "edit", edit_project_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit? + = link_to "raw", project_blob_path(@project, @id), class: "btn btn-tiny", target: "_blank" -# only show normal/blame view links for text files - if @tree.text? - if current_page? project_blame_path(@project, @id) - = link_to "normal view", project_tree_path(@project, @id), class: "btn very_small" + = link_to "normal view", project_tree_path(@project, @id), class: "btn btn-tiny" - else - = link_to "blame", project_blame_path(@project, @id), class: "btn very_small" - = link_to "history", project_commits_path(@project, @id), class: "btn very_small" + = link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny" + = link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny" diff --git a/app/views/tree/_head.html.haml b/app/views/tree/_head.html.haml index f14526cf23a..32c3882400e 100644 --- a/app/views/tree/_head.html.haml +++ b/app/views/tree/_head.html.haml @@ -3,5 +3,5 @@ = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: @path} = nav_link(controller: :tree) do = link_to 'Source', project_tree_path(@project, @ref) - %li.right + %li.pull-right = render "shared/clone_panel" diff --git a/app/views/tree/_tree.html.haml b/app/views/tree/_tree.html.haml index c2842959510..29a2ed02d31 100644 --- a/app/views/tree/_tree.html.haml +++ b/app/views/tree/_tree.html.haml @@ -24,7 +24,7 @@ %th Name %th Last Update %th Last Commit - %th= link_to "history", project_commits_path(@project, @id), class: "btn very_small right" + %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny pull-right" - if tree.up_dir? %tr.tree-item diff --git a/app/views/tree/edit.html.haml b/app/views/tree/edit.html.haml index adee68a00f8..81918e509b8 100644 --- a/app/views/tree/edit.html.haml +++ b/app/views/tree/edit.html.haml @@ -10,7 +10,7 @@ %strong= @ref %span.options .btn-group.tree-btn-group - = link_to "Cancel", project_tree_path(@project, @id), class: "btn very_small cancel-btn", confirm: "Are you sure?" + = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: "Are you sure?" .file_content.code %pre#editor= @tree.data @@ -27,7 +27,7 @@ .message to branch %strong= @ref - = link_to "Cancel", project_tree_path(@project, @id), class: "btn cancel-btn", confirm: "Are you sure?" + = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-cancel", confirm: "Are you sure?" :javascript var ace_mode = "#{@tree.language.try(:ace_mode)}"; |