Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/aura/aura.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
@import './src/components/master-detail-layout.css';
@import './src/components/menu-bar.css';
@import './src/components/message-input.css';
@import './src/components/message-list.css';
@import './src/components/multi-select-combo-box.css';
@import './src/components/notification.css';
@import './src/components/overlay.css';
Expand Down
1 change: 1 addition & 0 deletions packages/aura/src/color.css
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ vaadin-crud-edit,
vaadin-drawer-toggle,
vaadin-menu-bar-button,
vaadin-menu-bar-item,
vaadin-message::part(attachment),
vaadin-notification-container,
vaadin-notification-card,
vaadin-notification-card::part(overlay),
Expand Down
10 changes: 10 additions & 0 deletions packages/aura/src/components/button.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
--vaadin-button-shadow: var(--aura-shadow-xs);
}

vaadin-message::part(attachment),
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit) {
transition: scale 180ms;
position: relative;
Expand All @@ -14,6 +15,7 @@ vaadin-drawer-toggle[theme~='tertiary']::part(icon) {
opacity: 0.6;
}

vaadin-message::part(attachment),
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit):where(
:not([theme~='tertiary'])
) {
Expand All @@ -23,11 +25,13 @@ vaadin-drawer-toggle[theme~='tertiary']::part(icon) {
}

/* prettier-ignore */
vaadin-message::part(attachment),
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit):not([theme~='primary'], [theme~='tertiary']) {
background: var(--vaadin-button-background, var(--_background));
border-color: var(--vaadin-button-border-color, var(--aura-accent-border-color));
}

vaadin-message::part(attachment),
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit):where(
:not([theme~='primary'])
) {
Expand Down Expand Up @@ -75,6 +79,7 @@ vaadin-menu-bar-button[aria-haspopup='true']:not([slot='overflow']) {
color: color-mix(in srgb, currentColor 50%, transparent);
}

vaadin-message::part(attachment)::before,
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit):not(
[disabled]
)::before {
Expand All @@ -91,6 +96,7 @@ vaadin-menu-bar-button[aria-haspopup='true']:not([slot='overflow']) {
}

@supports (color: hsl(0 0 0)) {
vaadin-message::part(attachment)::before,
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit):not(
[disabled]
)::before {
Expand All @@ -100,6 +106,7 @@ vaadin-menu-bar-button[aria-haspopup='true']:not([slot='overflow']) {

@media (any-hover: hover) {
/* prettier-ignore */
vaadin-message::part(attachment):hover:not(:active)::before,
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit):hover:not([disabled], [active])::before {
opacity: 0.03;
}
Expand All @@ -112,18 +119,21 @@ vaadin-menu-bar-button[aria-haspopup='true']:not([slot='overflow']) {

@media (min-resolution: 2x) {
/* prettier-ignore */
vaadin-message::part(attachment):active,
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button[first-visible][last-visible], vaadin-drawer-toggle)[active]:not([disabled], [aria-disabled='true']) {
scale: 0.98;
transition-duration: 50ms;
}
}

vaadin-message::part(attachment):active,
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit)[active]:not(
[disabled]
) {
box-shadow: none;
}

vaadin-message::part(attachment):active::before,
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit)[active]:not(
[disabled]
)::before {
Expand Down
17 changes: 17 additions & 0 deletions packages/aura/src/components/message-list.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
vaadin-message::part(attachment) {
padding: 0 var(--vaadin-padding-xs) 0 0;
overflow: hidden;
border-width: 1px;
border-style: solid;
border-color: var(--vaadin-button-border-color, var(--aura-accent-border-color));
min-height: var(--_prefix-area-size);
border-radius: var(--vaadin-radius-m);
}

vaadin-message::part(attachment-image) {
padding: 0;
}

vaadin-message::part(attachment-preview) {
object-fit: cover;
}
54 changes: 32 additions & 22 deletions packages/message-list/src/styles/vaadin-message-base-styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,46 +70,56 @@ export const messageStyles = css`
[part='attachments'] {
display: flex;
flex-wrap: wrap;
gap: 6px;
gap: var(--vaadin-gap-s);
}

[part~='attachment'] {
display: inline-flex;
--_prefix-area-size: 2rem;
display: inline-grid;
grid-template-columns: var(--_prefix-area-size) auto;
align-items: center;
background: var(--vaadin-background-container);
color: inherit;
background: none;
border: none;
padding: 0;
margin: 0;
font: inherit;
cursor: pointer;
text-align: start;
}

[part~='attachment-image'] [part='attachment-preview'] {
display: block;
max-width: 200px;
max-height: 150px;
}

[part~='attachment-file'] {
gap: 6px;
}

[part='attachment-icon'] {
display: inline-block;
width: 1em;
height: 1em;
background: currentColor;
mask-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7Z"/><path d="M14 2v4a2 2 0 0 0 2 2h4"/></svg>');
mask-size: contain;
mask-repeat: no-repeat;
flex-shrink: 0;
width: 100%;
aspect-ratio: 1 / 1;
align-items: center;
justify-content: center;
grid-column: 1;
text-align: center;

&::before {
/* TODO: Replace with vaadin file icon, once it exists. */
content: '';
display: inline-flex;
align-items: center;
flex: none;
height: var(--vaadin-icon-size, 1lh);
width: var(--vaadin-icon-size, 1lh);
mask-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7Z"/><path d="M14 2v4a2 2 0 0 0 2 2h4"/></svg>');
mask-size: contain;
background: currentColor;
}
}

[part='attachment-preview'] {
grid-column: 1;
width: 100%;
aspect-ratio: 1 / 1;
}

[part='attachment-name'] {
grid-column: 2;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin-inline-end: var(--vaadin-padding-s);
}
`;
66 changes: 66 additions & 0 deletions packages/vaadin-lumo-styles/src/components/message.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,70 @@
:host([focus-ring]) {
box-shadow: inset 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
}

[part='attachments'] {
margin-block: var(--lumo-space-xs);
}

[part~='attachment'] {
--_prefix-area-size: var(--lumo-size-m);
min-width: var(--_prefix-area-size);
color: var(--lumo-body-text-color);
min-height: var(--_prefix-area-size);
border-radius: var(--lumo-border-radius-l);
overflow: hidden;
position: relative;

& [part='attachment-icon'] {
color: var(--lumo-secondary-text-color);
background: var(--lumo-contrast-5pct);
display: flex;
align-items: center;
justify-content: center;

&::before {
height: var(--lumo-icon-size-s);
width: var(--lumo-icon-size-s);
}
}

& [part='attachment-preview'] {
width: var(--_prefix-area-size);
object-fit: cover;
}

& [part='attachment-name'] {
margin-inline: var(--lumo-space-s);
font-size: var(--lumo-font-size-xs);
}

&::after {
content: '';
position: absolute;
z-index: 1;
inset: 0;
background: currentColor;
border-radius: inherit;
opacity: 0;
pointer-events: none;
filter: blur(8px);
}

&:hover::after {
opacity: 0.02;
}

&:focus {
outline: none;
box-shadow:
0 0 0 calc(1px * var(--_focus-ring-gap-on, 0)) var(--_focus-ring-gap-color, var(--lumo-base-color)),
0 0 0 calc(var(--_focus-ring-width) + 1px * var(--_focus-ring-gap-on, 0)) var(--_focus-ring-color);
}

&:active::after {
opacity: 0.1;
transition-duration: 0s, 0s;
transform: scale(0);
}
}
}