Browse Source
Merge pull request #22110 from nextcloud/feature/20931/followup-2
UserStatus Followup #2
pull/21996/head
Georg Ehrke
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
16 additions and
16 deletions
-
apps/user_status/css/user-status-menu.scss
-
apps/user_status/js/user-status-menu.js
-
apps/user_status/js/user-status-menu.js.map
-
apps/user_status/src/App.vue
|
|
|
@ -28,9 +28,7 @@ |
|
|
|
@include icon-color('user-status-dnd', 'user_status', '#ED484C', 1); |
|
|
|
} |
|
|
|
|
|
|
|
.icon-user-status-invisible { |
|
|
|
@include icon-color('user-status-invisible', 'user_status', '#000000', 1); |
|
|
|
} |
|
|
|
@include icon-black-white('user-status-invisible', 'user_status', 2); |
|
|
|
|
|
|
|
.icon-user-status-online { |
|
|
|
@include icon-color('user-status-online', 'user_status', '#49B382', 2); |
|
|
|
|
|
|
|
@ -22,7 +22,11 @@ |
|
|
|
<template> |
|
|
|
<li> |
|
|
|
<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 |
|
|
|
id="user-status-menu-item__subheader" |
|
|
|
:default-icon="statusIcon" |
|
|
|
@ -236,17 +240,14 @@ export default { |
|
|
|
#user-status-menu-item { |
|
|
|
&__header { |
|
|
|
display: block; |
|
|
|
align-items: center; |
|
|
|
color: var(--color-main-text); |
|
|
|
padding: 10px 12px 5px 12px; |
|
|
|
box-sizing: border-box; |
|
|
|
padding: 10px 12px 5px 38px; |
|
|
|
opacity: 1; |
|
|
|
white-space: nowrap; |
|
|
|
width: 100%; |
|
|
|
text-align: center; |
|
|
|
max-width: 250px; |
|
|
|
text-align: left; |
|
|
|
max-width: 150px; |
|
|
|
overflow: hidden; |
|
|
|
text-overflow: ellipsis; |
|
|
|
min-width: 175px; |
|
|
|
} |
|
|
|
|
|
|
|
&__subheader { |
|
|
|
@ -254,12 +255,13 @@ export default { |
|
|
|
|
|
|
|
> button { |
|
|
|
background-color: var(--color-main-background); |
|
|
|
background-position: 12px center; |
|
|
|
background-size: 16px; |
|
|
|
border: 0; |
|
|
|
border-radius: 0; |
|
|
|
font-weight: normal; |
|
|
|
font-size: 0.875em; |
|
|
|
padding-left: 40px; |
|
|
|
padding-left: 38px; |
|
|
|
opacity: 1; |
|
|
|
|
|
|
|
&:hover, |
|
|
|
&:focus { |
|
|
|
|