Commit e57ad62d authored by Annabel Gray's avatar Annabel Gray

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

Fix snippets embed form

Closes #46948

See merge request gitlab-org/gitlab-ce!19219
parents 02f8f900 bf2fb848
...@@ -49,26 +49,11 @@ ...@@ -49,26 +49,11 @@
margin-top: 15px; margin-top: 15px;
} }
.snippet-embed-input {
height: 35px;
}
.embed-snippet { .embed-snippet {
padding-right: 0; padding-right: 0;
padding-top: $gl-padding; padding-top: $gl-padding;
.form-control {
cursor: auto;
width: 101%;
margin-left: -1px;
}
.embed-toggle-list li button { .embed-toggle-list li button {
padding: 8px 40px; padding: 8px 40px;
} }
.embed-toggle,
.snippet-clipboard-btn {
height: 35px;
}
} }
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
- if public_snippet? - if public_snippet?
.embed-snippet .embed-snippet
.input-group .input-group
.input-group-btn .input-group-prepend
%button.btn.embed-toggle{ 'data-toggle': 'dropdown', type: 'button' } %button.btn.btn-svg.embed-toggle.input-group-text{ 'data-toggle': 'dropdown', type: 'button' }
%span.js-embed-action= _("Embed") %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 %ul.dropdown-menu.dropdown-menu-selectable.embed-toggle-list
%li %li
%button.js-embed-btn.btn.btn-transparent.is-active{ type: 'button' } %button.js-embed-btn.btn.btn-transparent.is-active{ type: 'button' }
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
%button.js-share-btn.btn.btn-transparent{ type: 'button' } %button.js-share-btn.btn.btn-transparent{ type: 'button' }
%strong.embed-toggle-list-item= _("Share") %strong.embed-toggle-list-item= _("Share")
%input.js-snippet-url-area.snippet-embed-input.form-control{ type: "text", autocomplete: 'off', value: snippet_embed } %input.js-snippet-url-area.snippet-embed-input.form-control{ type: "text", autocomplete: 'off', value: snippet_embed }
.input-group-btn .input-group-append
%button.js-clipboard-btn.snippet-clipboard-btn.btn.btn-default.has-tooltip{ title: "Copy to clipboard", 'data-clipboard-target': '.js-snippet-url-area' } = clipboard_button(title: s_('Copy to clipboard'), class: 'js-clipboard-btn snippet-clipboard-btn btn btn-default', target: '.js-snippet-url-area')
= sprite_icon('duplicate', size: 16)
.clearfix .clearfix
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment