Commit f11fa333 authored by Nathan Friend's avatar Nathan Friend

Merge branch 'add-outlines-to-issue-sidebar-links' into 'master'

Add outlines to issue right sidebar links

See merge request gitlab-org/gitlab!25633
parents 9b863049 9b848a75
...@@ -106,17 +106,17 @@ export default { ...@@ -106,17 +106,17 @@ export default {
<div class="title hide-collapsed"> <div class="title hide-collapsed">
{{ sprintf(__('Lock %{issuableDisplayName}'), { issuableDisplayName: issuableDisplayName }) }} {{ sprintf(__('Lock %{issuableDisplayName}'), { issuableDisplayName: issuableDisplayName }) }}
<button <a
v-if="isEditable" v-if="isEditable"
class="float-right lock-edit" class="float-right lock-edit"
type="button" href="#"
data-track-event="click_edit_button" data-track-event="click_edit_button"
data-track-label="right_sidebar" data-track-label="right_sidebar"
data-track-property="lock_issue" data-track-property="lock_issue"
@click.prevent="toggleForm" @click.prevent="toggleForm"
> >
{{ __('Edit') }} {{ __('Edit') }}
</button> </a>
</div> </div>
<div class="value sidebar-item-value hide-collapsed"> <div class="value sidebar-item-value hide-collapsed">
......
...@@ -127,7 +127,7 @@ export default { ...@@ -127,7 +127,7 @@ export default {
<div v-if="hasMoreParticipants" class="participants-more hide-collapsed"> <div v-if="hasMoreParticipants" class="participants-more hide-collapsed">
<button <button
type="button" type="button"
class="btn-transparent btn-blank js-toggle-participants-button" class="btn-transparent btn-link js-toggle-participants-button"
@click="toggleMoreParticipants" @click="toggleMoreParticipants"
> >
{{ toggleLabel }} {{ toggleLabel }}
......
...@@ -447,6 +447,7 @@ ...@@ -447,6 +447,7 @@
font-weight: normal; font-weight: normal;
border-radius: 0; border-radius: 0;
border-color: transparent; border-color: transparent;
border-width: 0;
&:hover, &:hover,
&:active, &:active,
......
...@@ -187,7 +187,6 @@ ...@@ -187,7 +187,6 @@
.btn-link { .btn-link {
color: inherit; color: inherit;
outline: none;
} }
.issuable-header-text { .issuable-header-text {
...@@ -261,15 +260,10 @@ ...@@ -261,15 +260,10 @@
color: rgba($gray-normal, 0.2); color: rgba($gray-normal, 0.2);
} }
.lock-edit, // uses same style, different js behaviour .confidential-edit,
.lock-edit,
.edit-link { .edit-link {
@extend .btn-blank; @extend .btn-link;
color: $gl-text-color;
&:hover {
text-decoration: underline;
color: $blue-800;
}
} }
} }
...@@ -689,7 +683,6 @@ ...@@ -689,7 +683,6 @@
} }
.btn-link { .btn-link {
outline: none;
padding: 0; padding: 0;
} }
......
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
<gl-loading-icon v-if="fetching || loading" :inline="true" class="js-weight-loading-icon" /> <gl-loading-icon v-if="fetching || loading" :inline="true" class="js-weight-loading-icon" />
<a <a
v-if="editable" v-if="editable"
class="float-right js-weight-edit-link" class="float-right edit-link js-weight-edit-link"
data-qa-selector="edit_weight_link" data-qa-selector="edit_weight_link"
href="#" href="#"
@click.prevent="onEditClick(!shouldShowEditField)" @click.prevent="onEditClick(!shouldShowEditField)"
......
...@@ -32,7 +32,7 @@ export default { ...@@ -32,7 +32,7 @@ export default {
</div> </div>
<template v-if="canEdit"> <template v-if="canEdit">
<gl-link <gl-link
class="btn btn-blank float-right sidebar-dropdown-toggle" class="edit-link float-right sidebar-dropdown-toggle"
@click="$emit('onClickEdit', $event)" @click="$emit('onClickEdit', $event)"
>{{ __('Edit') }}</gl-link >{{ __('Edit') }}</gl-link
> >
......
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