Commit 2da27205 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve css for file actions

parent 3aded9d5
......@@ -152,12 +152,9 @@
*/
.panel {
.panel-heading {
font-size: 14px;
line-height: 18px;
.panel-head-actions {
position: relative;
top: -6px;
top: -5px;
float: right;
}
}
......
......@@ -18,27 +18,21 @@
text-align: left;
padding: 10px 15px;
.options {
.file-actions {
float: right;
margin-top: -3px;
position: relative;
top: -5px;
.btn {
padding: 0px 10px;
font-size: 13px;
line-height: 28px;
}
}
.left-options {
margin-top: -3px;
}
.file_name {
font-weight: bold;
padding-left: 3px;
font-size: 14px;
small {
color: #888;
font-size: 13px;
font-weight: normal;
padding-left: 10px;
}
}
}
.file-content {
background: #fff;
......
......@@ -21,6 +21,8 @@
= link_to 'Alerts', '#alerts'
%li
= link_to 'Forms', '#forms'
%li
= link_to 'Files', '#file'
%li
= link_to 'Markdown', '#markdown'
......@@ -193,6 +195,23 @@
Remember me
%button.btn.btn-default{:type => "submit"} Sign in
%h2#file File
%h3
%code .file-holder
- blob = Snippet.new(content: "Wow\nSuch\nFile")
.example
.file-holder
.file-title
Awesome file
.file-actions
.btn-group
%a.btn Edit
%a.btn Remove
.file-contenta.code
= render 'shared/file_highlight', blob: blob
%h2#markdown Markdown
%h3
%code .md or .wiki and others
......
......@@ -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|
......
......@@ -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?
......
......@@ -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'
......
......@@ -13,12 +13,6 @@
.file-title
%i.fa.fa-file
%strong= snippet_blob[:snippet_object].file_name
%span.options
.btn-group.tree-btn-group.pull-right
- if snippet_blob[:snippet_object].author == current_user
= link_to "Edit", edit_snippet_path(snippet_blob[:snippet_object]), class: "btn btn-tiny", title: 'Edit Snippet'
= link_to "Delete", snippet_path(snippet_blob[:snippet_object]), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-tiny", title: 'Delete Snippet'
= link_to "Raw", raw_snippet_path(snippet_blob[:snippet_object]), class: "btn btn-tiny", target: "_blank"
- if gitlab_markdown?(snippet_blob[:snippet_object].file_name)
.file-content.wiki
- snippet_blob[:snippet_chunks].each do |snippet|
......
......@@ -31,9 +31,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_personal_snippet, @snippet)
= link_to "edit", edit_snippet_path(@snippet), class: "btn btn-small", title: 'Edit Snippet'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment