Download as
Browse Code »

Commit a022fd41645300e011feb3f6893813ce2d3cde11

Authored by Dmitriy Zaporozhets
1 parent 9ef5573c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Restyle clone panel on project show page

Showing 5 changed files with 47 additions and 20 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  Diff comments   View file @a022fd4
@@ -171,3 +171,8 @@ @@ -171,3 +171,8 @@
171 margin: 3px 3px 25px 3px; 171 margin: 3px 3px 25px 3px;
172 } 172 }
173 } 173 }
  174 +
  175 +.light-well {
  176 + background: #f9f9f9;
  177 + padding: 15px;
  178 +}
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @a022fd4
@@ -74,3 +74,9 @@ fieldset legend { font-size: 17px; } @@ -74,3 +74,9 @@ fieldset legend { font-size: 17px; }
74 .tab-content { 74 .tab-content {
75 overflow: visible; 75 overflow: visible;
76 } 76 }
  77 +
  78 +@media (max-width: 1200px) {
  79 + .only-wide {
  80 + display: none;
  81 + }
  82 +}
app/views/projects/_clone_panel.html.haml
  Diff comments   View file @a022fd4
1 .project_clone_panel 1 .project_clone_panel
2 .row 2 .row
3 - .span7 3 + .span8
4 .form-horizontal= render "shared/clone_panel" 4 .form-horizontal= render "shared/clone_panel"
5 - .span4.pull-right 5 + .span3.pull-right
6 .pull-right 6 .pull-right
7 - unless @project.empty_repo? 7 - unless @project.empty_repo?
8 - if can? current_user, :download_code, @project 8 - if can? current_user, :download_code, @project
9 = link_to archive_project_repository_path(@project), class: "btn grouped" do 9 = link_to archive_project_repository_path(@project), class: "btn grouped" do
10 %i.icon-download-alt 10 %i.icon-download-alt
11 Download 11 Download
12 - - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)  
13 - = link_to new_project_merge_request_path(@project), title: "New Merge Request", class: "btn grouped" do  
14 - Merge Request  
15 - - if @project.issues_enabled && can?(current_user, :write_issue, @project)  
16 - = link_to url_for_new_issue, title: "New Issue", class: "btn grouped" do  
17 - Issue 12 +
  13 + = link_to tags_project_repository_path(@project), class: "btn grouped only-wide", title: 'Git Tags' do
  14 + %i.icon-tags
  15 +
  16 + .dropdown.pull-right
  17 + %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
  18 + %i.icon-plus
  19 + Add new
  20 + %b.caret
  21 + %ul.dropdown-menu
  22 + - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
  23 + %li
  24 + = link_to new_project_merge_request_path(@project), title: "New Merge Request" do
  25 + Merge Request
  26 + - if @project.issues_enabled && can?(current_user, :write_issue, @project)
  27 + %li
  28 + = link_to url_for_new_issue, title: "New Issue" do
  29 + Issue
  30 + - if @project.snippets_enabled && can?(current_user, :write_snippet, @project)
  31 + %li
  32 + = link_to new_project_snippet_path(@project), title: "New Snippet" do
  33 + Snippet
  34 +
app/views/projects/show.html.haml
  Diff comments   View file @a022fd4
@@ -6,17 +6,16 @@ @@ -6,17 +6,16 @@
6 .content_list= render @events 6 .content_list= render @events
7 .loading.hide 7 .loading.hide
8 .span3 8 .span3
9 - .ui-box.white  
10 - .padded  
11 - %h3.page_title  
12 - = @project.name  
13 - - if @project.description.present?  
14 - %p.light= @project.description 9 + .light-well
  10 + %h3.page_title
  11 + = @project.name
  12 + - if @project.description.present?
  13 + %p.light= @project.description
15 14
16 - %hr  
17 - %p  
18 - %p Repo Size: #{@project.repository.size} MB  
19 - %p Created at: #{@project.created_at.stamp('Aug 22, 2013')}  
20 - %p Owner: #{link_to @project.owner_name, @project.owner} 15 + %hr
  16 + %p
  17 + %p Repo Size: #{@project.repository.size} MB
  18 + %p Created at: #{@project.created_at.stamp('Aug 22, 2013')}
  19 + %p Owner: #{link_to @project.owner_name, @project.owner}
21 :javascript 20 :javascript
22 $(function(){ Pager.init(20); }); 21 $(function(){ Pager.init(20); });
app/views/shared/_clone_panel.html.haml
  Diff comments   View file @a022fd4
1 .input-prepend.input-append.project_clone_holder 1 .input-prepend.input-append.project_clone_holder
2 %button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH 2 %button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH
3 %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase 3 %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase
4 - = text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select input-xxlarge", readonly: true 4 + = text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select span7", readonly: true
5 %span.add-on 5 %span.add-on
6 - if @project.public 6 - if @project.public
7 .cblue 7 .cblue