Merge pull request #22110 from nextcloud/feature/20931/followup-2

UserStatus Followup #2
This commit is contained in:
Georg Ehrke 2020-08-05 15:32:47 +02:00 committed by GitHub
commit 2b4b5db16d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions

View File

@ -28,9 +28,7 @@
@include icon-color('user-status-dnd', 'user_status', '#ED484C', 1); @include icon-color('user-status-dnd', 'user_status', '#ED484C', 1);
} }
.icon-user-status-invisible { @include icon-black-white('user-status-invisible', 'user_status', 2);
@include icon-color('user-status-invisible', 'user_status', '#000000', 1);
}
.icon-user-status-online { .icon-user-status-online {
@include icon-color('user-status-online', 'user_status', '#49B382', 2); @include icon-color('user-status-online', 'user_status', '#49B382', 2);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -22,7 +22,11 @@
<template> <template>
<li> <li>
<div id="user-status-menu-item"> <div id="user-status-menu-item">
<span id="user-status-menu-item__header">{{ displayName }}</span> <span
id="user-status-menu-item__header"
:title="displayName">
{{ displayName }}
</span>
<Actions <Actions
id="user-status-menu-item__subheader" id="user-status-menu-item__subheader"
:default-icon="statusIcon" :default-icon="statusIcon"
@ -236,17 +240,14 @@ export default {
#user-status-menu-item { #user-status-menu-item {
&__header { &__header {
display: block; display: block;
align-items: center;
color: var(--color-main-text); color: var(--color-main-text);
padding: 10px 12px 5px 12px; padding: 10px 12px 5px 38px;
box-sizing: border-box;
opacity: 1; opacity: 1;
white-space: nowrap; white-space: nowrap;
width: 100%; text-align: left;
text-align: center; max-width: 150px;
max-width: 250px; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
min-width: 175px;
} }
&__subheader { &__subheader {
@ -254,12 +255,13 @@ export default {
> button { > button {
background-color: var(--color-main-background); background-color: var(--color-main-background);
background-position: 12px center;
background-size: 16px; background-size: 16px;
border: 0; border: 0;
border-radius: 0; border-radius: 0;
font-weight: normal; font-weight: normal;
font-size: 0.875em; padding-left: 38px;
padding-left: 40px; opacity: 1;
&:hover, &:hover,
&:focus { &:focus {