Commit 4223beff authored by Phil Hughes's avatar Phil Hughes

changed a link into a button

i18n
parent 5372c2e8
...@@ -18,6 +18,9 @@ export default { ...@@ -18,6 +18,9 @@ export default {
showMergeRequestText() { showMergeRequestText() {
return this.currentMergeRequestId && this.viewer === viewerTypes.mr; return this.currentMergeRequestId && this.viewer === viewerTypes.mr;
}, },
mergeRequestId() {
return `!${this.currentMergeRequest.iid}`;
},
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
...@@ -57,7 +60,8 @@ export default { ...@@ -57,7 +60,8 @@ export default {
(<a (<a
v-if="currentMergeRequest" v-if="currentMergeRequest"
:href="currentMergeRequest.web_url" :href="currentMergeRequest.web_url"
>!{{ currentMergeRequest.iid }}</a>) v-text="mergeRequestId"
></a>)
</template> </template>
</div> </div>
</template> </template>
......
...@@ -127,9 +127,8 @@ export default { ...@@ -127,9 +127,8 @@ export default {
class="context-header ide-context-header dropdown" class="context-header ide-context-header dropdown"
ref="mergeRequestDropdown" ref="mergeRequestDropdown"
> >
<a <button
href="#" type="button"
role="button"
data-toggle="dropdown" data-toggle="dropdown"
> >
<div <div
...@@ -185,7 +184,7 @@ export default { ...@@ -185,7 +184,7 @@ export default {
class="ml-auto" class="ml-auto"
name="chevron-down" name="chevron-down"
/> />
</a> </button>
<merge-request-dropdown <merge-request-dropdown
:show="showMergeRequestsDropdown" :show="showMergeRequestsDropdown"
/> />
......
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
<input <input
type="search" type="search"
class="dropdown-input-field" class="dropdown-input-field"
placeholder="Search merge requests" :placeholder="__('Search merge requests')"
v-model="search" v-model="search"
@input="searchMergeRequests" @input="searchMergeRequests"
ref="searchInput" ref="searchInput"
......
...@@ -26,18 +26,24 @@ ...@@ -26,18 +26,24 @@
margin-right: 2px; margin-right: 2px;
width: $contextual-sidebar-width; width: $contextual-sidebar-width;
a { > a,
> button {
transition: padding $sidebar-transition-duration; transition: padding $sidebar-transition-duration;
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
display: flex; display: flex;
width: 100%;
align-items: center; align-items: center;
padding: 10px 16px 10px 10px; padding: 10px 16px 10px 10px;
color: $gl-text-color; color: $gl-text-color;
background-color: transparent;
border: 0;
text-align: left;
&:hover, &:hover,
a:hover { &:focus {
background-color: $link-hover-background; background-color: $link-hover-background;
color: $gl-text-color; color: $gl-text-color;
outline: 0;
} }
} }
......
...@@ -458,14 +458,10 @@ ...@@ -458,14 +458,10 @@
width: auto; width: auto;
margin-right: 0; margin-right: 0;
a { > a,
> button {
height: 60px; height: 60px;
} }
a:hover,
a:focus {
text-decoration: none;
}
} }
.projects-sidebar { .projects-sidebar {
...@@ -1302,6 +1298,10 @@ ...@@ -1302,6 +1298,10 @@
.dropdown-input { .dropdown-input {
padding-left: $gl-padding; padding-left: $gl-padding;
padding-right: $gl-padding; padding-right: $gl-padding;
.fa {
right: 26px;
}
} }
.btn-link { .btn-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