summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/blocks.scss4
-rw-r--r--app/views/projects/blame/_head.html.haml2
-rw-r--r--app/views/projects/blame/show.html.haml14
-rw-r--r--app/views/projects/edit_tree/show.html.haml1
4 files changed, 3 insertions, 18 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
index 16840184d2a..572bc18a3a1 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -70,10 +70,6 @@
border-top: 1px solid #eee;
}
- &.white {
- background: #fff;
- }
-
ul {
margin: 0;
}
diff --git a/app/views/projects/blame/_head.html.haml b/app/views/projects/blame/_head.html.haml
deleted file mode 100644
index 3a883829562..00000000000
--- a/app/views/projects/blame/_head.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%div.tree-ref-holder
- = render 'shared/ref_switcher', destination: 'tree', path: params[:path]
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index e9a69390577..cdca8b2e634 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -1,21 +1,11 @@
-= render "head"
+%h3.page-title Blame view
#tree-holder.tree-holder
- %ul.breadcrumb
- %li
- %i.icon-angle-right
- = link_to project_tree_path(@project, @ref) do
- = @project.name
- - tree_breadcrumbs(@tree, 6) do |link|
- \/
- %li= link
- .clear
-
.file-holder
.file-title
%i.icon-file
%span.file_name
- = @blob.name
+ = @path
%small= number_to_human_size @blob.size
%span.options= render "projects/blob/actions"
.file-content.blame
diff --git a/app/views/projects/edit_tree/show.html.haml b/app/views/projects/edit_tree/show.html.haml
index 65b6e994884..06396ba992b 100644
--- a/app/views/projects/edit_tree/show.html.haml
+++ b/app/views/projects/edit_tree/show.html.haml
@@ -1,3 +1,4 @@
+%h3.page-title Edit mode
.file-editor
= form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do
.file-holder