Merge branch 'master' of github.com:gitlabhq/gitlabhq

3 files changed, 30 insertions, 17 deletions

diff --git a/app/assets/stylesheets/base/mixins.scss b/app/assets/stylesheets/base/mixins.scss
index b8b163a42b2..a0794e7825a 100644
--- a/app/assets/stylesheets/base/mixins.scss
+++ b/app/assets/stylesheets/base/mixins.scss
@@ -21,6 +21,10 @@
   @include border-radius($radius 0 0 $radius)
 }
 
+@mixin border-radius-right($radius) {
+  @include border-radius(0 0 $radius $radius)
+}
+
 @mixin linear-gradient($from, $to) {
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
   background-image: -webkit-linear-gradient($from, $to);
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index e6a4bc62c58..5a8d4665294 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -102,6 +102,15 @@
 
   .input-group-addon {
     background: #FAFAFA;
+
+    &.git-protocols {
+      padding: 0;
+      border: none;
+
+      .input-group-btn:last-child > .btn {
+        @include border-radius-right(0);
+      }
+    }
   }
 }
 
diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml
index aaab0d35f59..60bb76e898a 100644
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
@@ -1,22 +1,22 @@
 - project = project || @project
 .git-clone-holder.input-group
-  .input-group-btn
-    %button{ |
-      :type => 'button', |
-      class: "btn btn-sm #{ 'active' if default_clone_protocol == 'ssh' }#{ ' has_tooltip' if current_user && current_user.require_ssh_key? }", |
-      :"data-clone" => project.ssh_url_to_repo, |
-      :"data-title" => "Add an SSH key to your profile<br> to pull or push via SSH",
-      :"data-html" => "true",
-      :"data-container" => "body"}
-      SSH
-    %button{ |
-      :type => 'button', |
-      class: "btn btn-sm #{ 'active' if default_clone_protocol == 'http' }#{ ' has_tooltip' if current_user && current_user.require_password? }", |
-      :"data-clone" => project.http_url_to_repo, |
-      :"data-title" => "Set a password on your account<br> to pull or push via #{gitlab_config.protocol.upcase}",
-      :"data-html" => "true",
-      :"data-container" => "body"}
-      = gitlab_config.protocol.upcase
+  .input-group-addon.git-protocols
+    .input-group-btn
+      %button{ |
+        class: "btn btn-sm #{ 'active' if default_clone_protocol == 'ssh' }#{ ' has_tooltip' if current_user && current_user.require_ssh_key? }", |
+        :"data-clone" => project.ssh_url_to_repo, |
+        :"data-title" => "Add an SSH key to your profile<br> to pull or push via SSH",
+        :"data-html" => "true",
+        :"data-container" => "body"}
+        SSH
+    .input-group-btn
+      %button{ |
+        class: "btn btn-sm #{ 'active' if default_clone_protocol == 'http' }#{ ' has_tooltip' if current_user && current_user.require_password? }", |
+        :"data-clone" => project.http_url_to_repo, |
+        :"data-title" => "Set a password on your account<br> to pull or push via #{gitlab_config.protocol.upcase}",
+        :"data-html" => "true",
+        :"data-container" => "body"}
+        = gitlab_config.protocol.upcase
   = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control input-sm", readonly: true
   - if project.kind_of?(Project)
     .input-group-addon