Commit f5365ccd authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch 'cngo-remove-issue-token-css' into 'master'

Remove global issue token css

See merge request gitlab-org/gitlab!71468
parents 6d5599f2 13dc19c1
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
<template> <template>
<div <div
:class="{ :class="{
'issue-token': isCondensed, 'issue-token gl-display-inline-flex gl-align-items-stretch gl-max-w-full gl-line-height-24 gl-white-space-nowrap': isCondensed,
'flex-row issuable-info-container': !isCondensed, 'flex-row issuable-info-container': !isCondensed,
}" }"
> >
...@@ -57,7 +57,7 @@ export default { ...@@ -57,7 +57,7 @@ export default {
ref="link" ref="link"
v-gl-tooltip v-gl-tooltip
:class="{ :class="{
'issue-token-link': isCondensed, 'issue-token-link gl-display-inline-flex gl-min-w-0 gl-text-gray-500': isCondensed,
'issuable-main-info': !isCondensed, 'issuable-main-info': !isCondensed,
}" }"
:href="computedPath" :href="computedPath"
...@@ -69,19 +69,19 @@ export default { ...@@ -69,19 +69,19 @@ export default {
v-if="hasTitle" v-if="hasTitle"
ref="title" ref="title"
:class="{ :class="{
'issue-token-title issue-token-end': isCondensed, 'issue-token-title issue-token-end gl-overflow-hidden gl-display-flex gl-align-items-baseline gl-text-gray-500 gl-pl-3': isCondensed,
'issue-title block-truncated': !isCondensed, 'issue-title block-truncated': !isCondensed,
'issue-token-title-standalone': !canRemove, 'gl-rounded-top-right-small gl-rounded-bottom-right-small gl-pr-3': !canRemove,
}" }"
class="js-issue-token-title" class="js-issue-token-title"
> >
<span class="issue-token-title-text">{{ title }}</span> <span class="gl-text-truncate">{{ title }}</span>
</component> </component>
<component <component
:is="innerComponentType" :is="innerComponentType"
ref="reference" ref="reference"
:class="{ :class="{
'issue-token-reference': isCondensed, 'issue-token-reference gl-display-flex gl-align-items-center gl-rounded-top-left-small gl-rounded-bottom-left-small gl-px-3': isCondensed,
'issuable-info': !isCondensed, 'issuable-info': !isCondensed,
}" }"
> >
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
ref="removeButton" ref="removeButton"
v-gl-tooltip v-gl-tooltip
:class="{ :class="{
'issue-token-remove-button': isCondensed, 'issue-token-remove-button gl-display-flex gl-align-items-center gl-px-3 gl-border-0 gl-rounded-top-right-small gl-rounded-bottom-right-small gl-text-gray-500': isCondensed,
'btn btn-default': !isCondensed, 'btn btn-default': !isCondensed,
}" }"
:title="removeButtonLabel" :title="removeButtonLabel"
......
...@@ -76,7 +76,7 @@ export default { ...@@ -76,7 +76,7 @@ export default {
</script> </script>
<template> <template>
<div v-if="confidential" class="block cve-id-request"> <div v-if="confidential" class="cve-id-request gl-display-block gl-pb-0 gl-border-b-0">
<div <div
v-gl-tooltip.viewport.left v-gl-tooltip.viewport.left
:title="tooltipTitle" :title="tooltipTitle"
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
<gl-icon name="close" /> <gl-icon name="close" />
</div> </div>
<div class="cve-id-request-content"> <div class="gl-mt-5">
<gl-link <gl-link
:href="newCveIdRequestUrl" :href="newCveIdRequestUrl"
target="_blank" target="_blank"
......
.issue-token {
display: inline-flex;
align-items: stretch;
max-width: 100%;
line-height: 1.75;
white-space: nowrap;
}
.issue-token-link { .issue-token-link {
display: inline-flex;
min-width: 0;
color: $gl-text-color-secondary;
&[href] { &[href] {
color: $blue-600; color: $blue-600;
} }
...@@ -24,14 +11,8 @@ ...@@ -24,14 +11,8 @@
} }
.issue-token-reference { .issue-token-reference {
display: flex;
align-items: center;
margin-right: 1px; margin-right: 1px;
padding-left: 0.5em;
padding-right: 0.5em;
background-color: $gray-lighter; background-color: $gray-lighter;
border-top-left-radius: 2px;
border-bottom-left-radius: 2px;
transition: background $general-hover-transition-duration $general-hover-transition-curve, color $general-hover-transition-duration $general-hover-transition-curve; transition: background $general-hover-transition-duration $general-hover-transition-curve, color $general-hover-transition-duration $general-hover-transition-curve;
.issue-token:hover &, .issue-token:hover &,
...@@ -43,12 +24,7 @@ ...@@ -43,12 +24,7 @@
} }
.issue-token-title { .issue-token-title {
overflow: hidden;
display: flex;
align-items: baseline;
padding-left: 0.5em;
background-color: $gray-normal; background-color: $gray-normal;
color: $gl-text-color-secondary;
transition: background $general-hover-transition-duration $general-hover-transition-curve; transition: background $general-hover-transition-duration $general-hover-transition-curve;
.issue-token:hover &, .issue-token:hover &,
...@@ -57,26 +33,8 @@ ...@@ -57,26 +33,8 @@
} }
} }
.issue-token-title-standalone {
padding-right: 0.5em;
border-top-right-radius: 2px;
border-bottom-right-radius: 2px;
}
.issue-token-title-text {
overflow: hidden;
text-overflow: ellipsis;
}
.issue-token-remove-button { .issue-token-remove-button {
display: flex;
align-items: center;
padding: 0 0.5em;
background-color: $gray-normal; background-color: $gray-normal;
border: 0;
border-top-right-radius: 2px;
border-bottom-right-radius: 2px;
color: $gl-text-color-secondary;
transition: background $general-hover-transition-duration $general-hover-transition-curve; transition: background $general-hover-transition-duration $general-hover-transition-curve;
&:hover, &:hover,
...@@ -89,9 +47,6 @@ ...@@ -89,9 +47,6 @@
} }
.cve-id-request { .cve-id-request {
padding-bottom: 0;
border-bottom: 0;
.help-button, .help-button,
.close-help-button { .close-help-button {
cursor: pointer; cursor: pointer;
...@@ -110,10 +65,6 @@ ...@@ -110,10 +65,6 @@
opacity: 0; opacity: 0;
} }
.cve-id-request-content {
margin-top: 16px;
}
.cve-id-request-help-state { .cve-id-request-help-state {
background: $white; background: $white;
margin: 16px -20px -20px; margin: 16px -20px -20px;
......
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