Commit 6f85b3c3 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch...

Merge branch '229304-migrate-bootstrap-button-to-gitlab-ui-glbutton-in-app-assets-javascripts-badges-components' into 'master'

Migrate Bootstrap button to GitLab UI GlButton (229304)

See merge request gitlab-org/gitlab!42518
parents 4289b971 e96087f5
<script> <script>
import { GlLoadingIcon, GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { GlLoadingIcon, GlTooltipDirective, GlIcon, GlButton } from '@gitlab/ui';
export default { export default {
// name: 'Badge' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25 // name: 'Badge' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25
...@@ -8,6 +8,7 @@ export default { ...@@ -8,6 +8,7 @@ export default {
components: { components: {
GlIcon, GlIcon,
GlLoadingIcon, GlLoadingIcon,
GlButton,
}, },
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
...@@ -90,15 +91,16 @@ export default { ...@@ -90,15 +91,16 @@ export default {
</div> </div>
</div> </div>
<button <gl-button
v-show="hasError" v-show="hasError"
v-gl-tooltip.hover v-gl-tooltip.hover
:title="s__('Badges|Reload badge image')" :title="s__('Badges|Reload badge image')"
class="btn btn-transparent btn-sm text-primary" category="tertiary"
variant="success"
type="button" type="button"
icon="retry"
size="small"
@click="reloadImage" @click="reloadImage"
> />
<gl-icon :size="16" name="retry" />
</button>
</div> </div>
</template> </template>
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