Merge branch 'fix-snippets-embed' into 'master'

app/assets/stylesheets/framework/snippets.scss

@@ -49,26 +49,11 @@
   margin-top: 15px;
 }
 
-.snippet-embed-input {
-  height: 35px;
-}
-
 .embed-snippet {
   padding-right: 0;
   padding-top: $gl-padding;
 
-  .form-control {
-    cursor: auto;
-    width: 101%;
-    margin-left: -1px;
-  }
-
   .embed-toggle-list li button {
     padding: 8px 40px;
   }
-
-  .embed-toggle,
-  .snippet-clipboard-btn {
-    height: 35px;
-  }
 }

app/views/shared/snippets/_header.html.haml

@@ -32,10 +32,10 @@
   - if public_snippet?
     .embed-snippet
       .input-group
-        .input-group-btn
-          %button.btn.embed-toggle{ 'data-toggle': 'dropdown', type: 'button' }
+        .input-group-prepend
+          %button.btn.btn-svg.embed-toggle.input-group-text{ 'data-toggle': 'dropdown', type: 'button' }
             %span.js-embed-action= _("Embed")
-            = sprite_icon('angle-down', size: 12)
+            = sprite_icon('angle-down', size: 12, css_class: 'caret-down')
           %ul.dropdown-menu.dropdown-menu-selectable.embed-toggle-list
             %li
               %button.js-embed-btn.btn.btn-transparent.is-active{ type: 'button' }
@@ -44,7 +44,6 @@
               %button.js-share-btn.btn.btn-transparent{ type: 'button' }
                 %strong.embed-toggle-list-item= _("Share")
         %input.js-snippet-url-area.snippet-embed-input.form-control{ type: "text", autocomplete: 'off', value: snippet_embed }
-        .input-group-btn
-          %button.js-clipboard-btn.snippet-clipboard-btn.btn.btn-default.has-tooltip{ title: "Copy to clipboard", 'data-clipboard-target': '.js-snippet-url-area' }
-            = sprite_icon('duplicate', size: 16)
+        .input-group-append
+          = clipboard_button(title: s_('Copy to clipboard'), class: 'js-clipboard-btn snippet-clipboard-btn btn btn-default', target: '.js-snippet-url-area')
     .clearfix