Commit 92a40178 authored by Paul Slaughter's avatar Paul Slaughter

Merge branch...

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

Migrate ide edit dropdown button

Closes #229284

See merge request gitlab-org/gitlab!43403
parents 35e12dce f3ff6cac
<script> <script>
import { GlButton } from '@gitlab/ui';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
import { viewerTypes } from '../constants'; import { viewerTypes } from '../constants';
export default { export default {
components: {
GlButton,
},
props: { props: {
viewer: { viewer: {
type: String, type: String,
...@@ -31,7 +35,7 @@ export default { ...@@ -31,7 +35,7 @@ export default {
<template> <template>
<div class="dropdown"> <div class="dropdown">
<button type="button" class="btn btn-link" data-toggle="dropdown">{{ __('Edit') }}</button> <gl-button variant="link" data-toggle="dropdown">{{ __('Edit') }}</gl-button>
<div class="dropdown-menu dropdown-menu-selectable dropdown-open-left"> <div class="dropdown-menu dropdown-menu-selectable dropdown-open-left">
<ul> <ul>
<li> <li>
......
...@@ -6,9 +6,10 @@ ...@@ -6,9 +6,10 @@
$bs-input-focus-box-shadow: rgba(0, 123, 255, 0.25); $bs-input-focus-box-shadow: rgba(0, 123, 255, 0.25);
a:not(.btn), a:not(.btn),
.btn-link:hover, .gl-button.btn-link,
.btn-link:focus, .gl-button.btn-link:hover,
.btn-link:active { .gl-button.btn-link:focus,
.gl-button.btn-link:active {
color: var(--ide-link-color, $blue-600); color: var(--ide-link-color, $blue-600);
} }
......
---
title: Update IDE compare changes view button to link style
merge_request: 43403
author:
type: other
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