Restyle clone panel on project show page

diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
index 6604d11..867920a 100644 (file)
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -171,3 +171,8 @@
     margin: 3px 3px 25px 3px;
   }
 }
+
+.light-well {
+  background: #f9f9f9;
+  padding: 15px;
+}

diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss
index 3ec03b9..dd072b9 100644 (file)
--- a/app/assets/stylesheets/gitlab_bootstrap/common.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -74,3 +74,9 @@ fieldset legend { font-size: 17px; }
 .tab-content {
   overflow: visible;
 }
+
+@media (max-width: 1200px) {
+  .only-wide {
+    display: none;
+  }
+}

diff --git a/app/views/projects/_clone_panel.html.haml b/app/views/projects/_clone_panel.html.haml
index bc794f4..8fe7671 100644 (file)
--- a/app/views/projects/_clone_panel.html.haml
+++ b/app/views/projects/_clone_panel.html.haml
@@ -1,17 +1,34 @@
 .project_clone_panel
   .row
-    .span7
+    .span8
       .form-horizontal= render "shared/clone_panel"
-    .span4.pull-right
+    .span3.pull-right
       .pull-right
         - unless @project.empty_repo?
           - if can? current_user, :download_code, @project
             = 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 grouped" do
-              Merge Request
-          - if @project.issues_enabled && can?(current_user, :write_issue, @project)
-            = link_to url_for_new_issue, title: "New Issue", class: "btn grouped" do
-              Issue
+
+            = link_to tags_project_repository_path(@project), class: "btn grouped only-wide", title: 'Git Tags' do
+              %i.icon-tags
+
+            .dropdown.pull-right
+              %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
+                %i.icon-plus
+                Add new
+                %b.caret
+              %ul.dropdown-menu
+                - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
+                  %li
+                    = link_to new_project_merge_request_path(@project), title: "New Merge Request" do
+                      Merge Request
+                - if @project.issues_enabled && can?(current_user, :write_issue, @project)
+                  %li
+                    = link_to url_for_new_issue, title: "New Issue" do
+                      Issue
+                - if @project.snippets_enabled && can?(current_user, :write_snippet, @project)
+                  %li
+                    = link_to new_project_snippet_path(@project), title: "New Snippet" do
+                      Snippet
+

diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index e28a210..2fe7daf 100644 (file)
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -6,17 +6,16 @@
     .content_list= render @events
     .loading.hide
   .span3
-    .ui-box.white
-      .padded
-        %h3.page_title
-          = @project.name
-        - if @project.description.present?
-          %p.light= @project.description
+    .light-well
+      %h3.page_title
+        = @project.name
+      - if @project.description.present?
+        %p.light= @project.description
 
-        %hr
-        %p
-        %p Repo Size: #{@project.repository.size} MB
-        %p Created at: #{@project.created_at.stamp('Aug 22, 2013')}
-        %p Owner: #{link_to @project.owner_name, @project.owner}
+      %hr
+      %p
+      %p Repo Size: #{@project.repository.size} MB
+      %p Created at: #{@project.created_at.stamp('Aug 22, 2013')}
+      %p Owner: #{link_to @project.owner_name, @project.owner}
 :javascript
   $(function(){ Pager.init(20); });

diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml
index 191532d..9e5b8da 100644 (file)
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
@@ -1,7 +1,7 @@
 .input-prepend.input-append.project_clone_holder
   %button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH
   %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase
-  = text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select input-xxlarge", readonly: true
+  = text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select span7", readonly: true
   %span.add-on
     - if @project.public
       .cblue