rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix changes after rebase with master 

- added in role desciption again given changes to checkbox
- added tooltip again given changes to role checkbox label slot
This commit is contained in:
Richard Cox 2021-03-29 15:55:44 +01:00
parent 6be248a6f9
commit a5d76e5d7c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/GlobalRoleBindings.vue
View File

@ -310,13 +310,16 @@ export default {
v-model="selectedRoles"
:value-when-true="role.id"
:disabled="!!assignOnlyRoles[role.id]"
:tooltip-key="!!assignOnlyRoles[role.id] ? 'rbac.globalRoles.assignOnlyRole' : ''"
:label="role.nameDisplay"
:description="role.description"
:mode="mode"
@input="checkboxChanged"
>
<template #label>
<span class="checkbox-label">{{ role.nameDisplay }}</span>
<div class="checkbox-label-slot">
<span class="checkbox-label">{{ role.nameDisplay }}</span>
<i v-if="!!assignOnlyRoles[role.id]" v-tooltip="t('rbac.globalRoles.assignOnlyRole')" class="checkbox-info icon icon-info icon-lg" />
</div>
</template>
</Checkbox>
</div>
@ -354,7 +357,11 @@ export default {
grid-template-columns: 100%;
}
.checkbox-label{
.checkbox-label {
&-slot {
display: inline-flex;
align-items: center;
}
color: var(--body-text);
margin: 0;
}