Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-14 05:20:25 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-14 05:20:25 +0300
commit2da2720584e162c53436a046380740bd64c3ad24 (patch)
tree7608f1eb08ae5b4e84571257b5f2a8b95cbc1273 /app/views/projects
parent3aded9d5816b8605d5ccf486ab2e38247e2b654f (diff)
Improve css for file actions
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/blame/show.html.haml7
-rw-r--r--app/views/projects/blob/_blob.html.haml10
-rw-r--r--app/views/projects/snippets/show.html.haml4
3 files changed, 12 insertions, 9 deletions
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index 4cc1fedb1ce..e6a859fea8f 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -4,10 +4,11 @@
.file-holder
.file-title
%i.fa.fa-file
- %span.file_name
+ %strong
= @path
- %small= number_to_human_size @blob.size
- %span.options= render "projects/blob/actions"
+ %small= number_to_human_size @blob.size
+ .file-actions
+ = render "projects/blob/actions"
.file-content.blame.highlight
%table
- @blame.each do |commit, lines, since|
diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml
index 9ff61f3887f..ba60bd92869 100644
--- a/app/views/projects/blob/_blob.html.haml
+++ b/app/views/projects/blob/_blob.html.haml
@@ -21,12 +21,14 @@
%div#tree-content-holder.tree-content-holder
%article.file-holder
- .file-title.clearfix
+ .file-title
%i.fa.fa-file
- %span.file_name
+ %strong
= blob.name
- %small= number_to_human_size blob.size
- %span.options.hidden-xs= render "actions"
+ %small
+ = number_to_human_size(blob.size)
+ .file-actions.hidden-xs
+ = render "actions"
- if blob.text?
= render "text", blob: blob
- elsif blob.image?
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index 345848fa6d1..408e3c0224a 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -23,9 +23,9 @@
.file-holder
.file-title
%i.fa.fa-file
- %span.file_name
+ %strong
= @snippet.file_name
- .options
+ .file-actions
.btn-group
- if can?(current_user, :modify_project_snippet, @snippet)
= link_to "edit", edit_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-small", title: 'Edit Snippet'