CSS improvements for diff & file view
This commit is contained in:
parent
a27ee18428
commit
be79c9def9
13 changed files with 46 additions and 29 deletions
|
@ -23,10 +23,12 @@
|
|||
.diff_file
|
||||
.diff_file_header
|
||||
- if diff.deleted_file
|
||||
%strong{:id => "#{diff.old_path}"}= diff.old_path
|
||||
%i.icon-file
|
||||
%span{:id => "#{diff.old_path}"}= diff.old_path
|
||||
- else
|
||||
= link_to tree_file_project_ref_path(@project, @commit.id, diff.new_path) do
|
||||
%strong{:id => "#{diff.new_path}"}= diff.new_path
|
||||
%i.icon-file
|
||||
%span{:id => "#{diff.new_path}"}= diff.new_path
|
||||
%br/
|
||||
.diff_file_content
|
||||
- if file.text?
|
||||
|
|
|
@ -6,5 +6,6 @@
|
|||
= link_to dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" do
|
||||
Requests
|
||||
%span.count= current_user.cared_merge_requests.count
|
||||
= link_to "Search", search_path, :class => "#{"current" if current_page?(search_path)}"
|
||||
= link_to search_path, :class => "#{"current" if current_page?(search_path)}" do
|
||||
Search
|
||||
= link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}"
|
||||
|
|
|
@ -2,7 +2,8 @@
|
|||
= link_to @project.code, project_path(@project), :class => "home #{project_tab_class}", :title => "Project"
|
||||
- if @project.repo_exists?
|
||||
- if can? current_user, :download_code, @project
|
||||
= link_to "Files", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
|
||||
= link_to tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class do
|
||||
Files
|
||||
= link_to "Commits", project_commits_path(@project), :class => commit_tab_class
|
||||
|
||||
= link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
to your profile
|
||||
- if @events.any?
|
||||
= render @events
|
||||
- else
|
||||
- else
|
||||
.padded
|
||||
%strong.cgray Projects activity will be displayed here
|
||||
.side
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
:css
|
||||
.view_file
|
||||
.view_file_header
|
||||
.row
|
||||
.span1.file_icon= image_tag(file.image? ? "file_img.png" : "file_txt.png")
|
||||
.span2.mode_text= file.mode
|
||||
.span5.file_name= name
|
||||
.span3.right
|
||||
= link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path]), :class => "right", :target => "_blank"
|
||||
= link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref), :class => "right", :style => "margin-right:10px;"
|
||||
%i.icon-file
|
||||
%span.file_name
|
||||
= name
|
||||
%small #{file.mode}
|
||||
%span.right
|
||||
= link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path]), :class => "right", :target => "_blank"
|
||||
= link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref), :class => "right", :style => "margin-right:10px;"
|
||||
- if file.text?
|
||||
- if name =~ /\.(md|markdown)$/i
|
||||
#tree-readme-holder
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#tree-content-holder
|
||||
.view_file
|
||||
.view_file_header
|
||||
%i.icon-file
|
||||
%strong= @snippet.file_name
|
||||
.view_file_content
|
||||
%div{:class => current_user.dark_scheme ? "black" : ""}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue