Commit 4ac10981 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch 'jivanvl-add-gl-button-snippets' into 'master'

Add gl-button class to the snippets haml views

See merge request gitlab-org/gitlab!43181
parents 53c9461d bf3ba86e
...@@ -46,11 +46,11 @@ ...@@ -46,11 +46,11 @@
.form-actions .form-actions
- if @snippet.new_record? - if @snippet.new_record?
= f.submit 'Create snippet', class: "btn-success btn", data: { qa_selector: 'submit_button' } = f.submit 'Create snippet', class: "btn-success btn gl-button", data: { qa_selector: 'submit_button' }
- else - else
= f.submit 'Save changes', class: "btn-success btn", data: { qa_selector: 'submit_button' } = f.submit 'Save changes', class: "btn-success btn gl-button", data: { qa_selector: 'submit_button' }
- if @snippet.project_id - if @snippet.project_id
= link_to "Cancel", project_snippets_path(@project), class: "btn btn-cancel" = link_to "Cancel", project_snippets_path(@project), class: "btn gl-button btn-default"
- else - else
= link_to "Cancel", snippets_path(@project), class: "btn btn-cancel" = link_to "Cancel", snippets_path(@project), class: "btn gl-button btn-default"
...@@ -31,15 +31,15 @@ ...@@ -31,15 +31,15 @@
.embed-snippet .embed-snippet
.input-group .input-group
.input-group-prepend .input-group-prepend
%button.btn.btn-svg.embed-toggle.input-group-text{ 'data-toggle': 'dropdown', type: 'button' } %button.btn.gl-button.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, css_class: 'caret-down') = 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.gl-button.btn-default-tertiary.is-active{ type: 'button' }
%strong.embed-toggle-list-item= _("Embed") %strong.embed-toggle-list-item= _("Embed")
%li %li
%button.js-share-btn.btn.btn-transparent{ type: 'button' } %button.js-share-btn.btn.gl-button.btn-default-tertiary{ type: 'button' }
%strong.embed-toggle-list-item= _("Share") %strong.embed-toggle-list-item= _("Share")
= snippet_embed_input(@snippet) = snippet_embed_input(@snippet)
.input-group-append .input-group-append
......
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