Implemented bootstrap 2.2.1.1. Restyled header panel
This commit is contained in:
parent
236584c2f8
commit
942c410119
13 changed files with 134 additions and 233 deletions
|
@ -22,7 +22,7 @@
|
|||
.diff_file_header
|
||||
- if diff.deleted_file
|
||||
%span= diff.old_path
|
||||
|
||||
|
||||
- if @commit.prev_commit
|
||||
= link_to project_tree_path(@project, tree_join(@commit.prev_commit_id, diff.new_path)), {:class => 'btn right view-commit'} do
|
||||
View file @
|
||||
|
@ -31,11 +31,11 @@
|
|||
%span= diff.new_path
|
||||
- if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
|
||||
%span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
|
||||
|
||||
= link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn right view-commit'} do
|
||||
|
||||
= link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn very_small right view-commit'} do
|
||||
View file @
|
||||
%span.commit-short-id= @commit.short_id(6)
|
||||
|
||||
|
||||
%br/
|
||||
.diff_file_content
|
||||
-# Skipp all non non-supported blobs
|
||||
|
@ -51,10 +51,10 @@
|
|||
%div.image-info= "#{number_to_human_size file.size}"
|
||||
- else
|
||||
.diff_file_content_image.img_compared
|
||||
.image.diff_removed
|
||||
.image.diff_removed
|
||||
%img{src: "data:#{file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
|
||||
%div.image-info= "#{number_to_human_size file.size}"
|
||||
.image.diff_added
|
||||
.image.diff_added
|
||||
%img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
|
||||
%div.image-info= "#{number_to_human_size file.size}"
|
||||
- else
|
||||
|
|
|
@ -1,29 +1,35 @@
|
|||
/ Page Header
|
||||
%header.top_panel_holder
|
||||
.container
|
||||
.top_panel_content
|
||||
%header.navbar.navbar-static-top.navbar-gitlab
|
||||
.navbar-inner
|
||||
.container
|
||||
%div.app_logo
|
||||
= link_to root_path, class: "home", title: "Home" do
|
||||
%h1
|
||||
GITLAB
|
||||
%h1 GITLAB
|
||||
%span.separator
|
||||
%h1.project_name= title
|
||||
= render "layouts/search"
|
||||
.fbtn
|
||||
%ul.nav
|
||||
- if current_user.is_admin?
|
||||
= link_to admin_root_path, class: "btn small", title: "Admin area" do
|
||||
%i.icon-cog
|
||||
Admin
|
||||
%li
|
||||
= link_to admin_root_path, title: "Admin area" do
|
||||
%i.icon-cog
|
||||
Admin
|
||||
- if current_user.can_create_project?
|
||||
= link_to new_project_path, class: "btn small", title: "Create New Project" do
|
||||
%i.icon-plus
|
||||
Project
|
||||
.account-box
|
||||
= link_to profile_path, class: "pic" do
|
||||
= image_tag gravatar_icon(current_user.email)
|
||||
.account-links
|
||||
= link_to profile_path, class: "username" do
|
||||
My profile
|
||||
= link_to 'Logout', destroy_user_session_path, class: "logout", method: :delete
|
||||
%li
|
||||
= link_to new_project_path, title: "Create New Project" do
|
||||
%i.icon-plus
|
||||
Project
|
||||
%li
|
||||
= render "layouts/search"
|
||||
%li
|
||||
.account-box
|
||||
= link_to profile_path, class: "pic" do
|
||||
= image_tag gravatar_icon(current_user.email)
|
||||
.account-links
|
||||
= link_to profile_path, class: "username" do
|
||||
%i.icon-user.icon-white
|
||||
My profile
|
||||
= link_to destroy_user_session_path, class: "logout", method: :delete do
|
||||
%i.icon-signout.icon-white
|
||||
Logout
|
||||
|
||||
|
||||
= render "layouts/init_auto_complete"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.search
|
||||
= form_tag search_path, method: :get do |f|
|
||||
= form_tag search_path, method: :get, class: 'navbar-form pull-left' do |f|
|
||||
= text_field_tag "search", nil, placeholder: "Search", class: "search-input"
|
||||
|
||||
:javascript
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
.right
|
||||
- unless @project.empty_repo?
|
||||
- if can? current_user, :download_code, @project
|
||||
= link_to archive_project_repository_path(@project), class: "btn small grouped" do
|
||||
= link_to archive_project_repository_path(@project), class: "btn grouped" do
|
||||
%i.icon-download-alt
|
||||
Download
|
||||
- if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
|
||||
= link_to new_project_merge_request_path(@project), title: "New Merge Request", class: "btn small grouped" do
|
||||
= link_to new_project_merge_request_path(@project), title: "New Merge Request", class: "btn grouped" do
|
||||
Merge Request
|
||||
- if @project.issues_enabled && can?(current_user, :write_issue, @project)
|
||||
= link_to new_project_issue_path(@project), title: "New Issue", class: "btn small grouped" do
|
||||
= link_to new_project_issue_path(@project), title: "New Issue", class: "btn grouped" do
|
||||
Issue
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.input-prepend.project_clone_holder
|
||||
%button{class: "btn small active", :"data-clone" => @project.ssh_url_to_repo} SSH
|
||||
%button{class: "btn small", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.web_protocol.upcase
|
||||
%button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH
|
||||
%button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.web_protocol.upcase
|
||||
= text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select span5"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue