Commit f3615fb0 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch '223184-replace-fa-minus-circle-with-gitlab-svg-icon' into 'master'

Resolve "Replace fa-minus-circle with GitLab SVG icon"

Closes #223184

See merge request gitlab-org/gitlab!38141
parents 6db42a00 5ca6db88
...@@ -260,10 +260,6 @@ ...@@ -260,10 +260,6 @@
content: '\f0a3'; content: '\f0a3';
} }
.fa-minus-circle::before {
content: '\f056';
}
.fa-bitbucket::before { .fa-bitbucket::before {
content: '\f171'; content: '\f171';
} }
......
...@@ -86,7 +86,6 @@ ...@@ -86,7 +86,6 @@
height: $input-height; height: $input-height;
padding: 0; padding: 0;
background: transparent; background: transparent;
border: 0;
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
&:hover, &:hover,
......
...@@ -24,5 +24,5 @@ ...@@ -24,5 +24,5 @@
name: value_input_name, name: value_input_name,
placeholder: s_('CiVariables|Input variable value') } placeholder: s_('CiVariables|Input variable value') }
= value = value
%button.js-row-remove-button.ci-variable-row-remove-button.table-section.section-5.border-top-0{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') } %button.btn.btn-svg.btn-item-remove.js-row-remove-button.ci-variable-row-remove-button.table-section{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
= icon('minus-circle') = sprite_icon('close')
...@@ -60,5 +60,5 @@ ...@@ -60,5 +60,5 @@
value: is_masked, value: is_masked,
data: { default: is_masked_default.to_s } } data: { default: is_masked_default.to_s } }
= render_if_exists 'ci/variables/environment_scope', form_field: form_field, variable: variable = render_if_exists 'ci/variables/environment_scope', form_field: form_field, variable: variable
%button.js-row-remove-button.ci-variable-row-remove-button.table-section.section-5.border-top-0{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') } %button.btn.btn-svg.js-row-remove-button.ci-variable-row-remove-button.table-section{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
= icon('minus-circle') = sprite_icon('close')
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