Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 13:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve LinkPreviewWidget (#8881)

Browse Source 
* Use shorthand for margin values

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Merge style declarations

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Merge style declarations

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Include mx_MatrixChat_useCompactLayout in mx_LinkPreviewWidget

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Include in mx_LinkPreviewWidget

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* yarn run lint:style --fix

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Use spacing variables

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Use logical variables

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Prevent flex children blowout

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Wrap caption

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* yarn run lint:style --fix

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Set row-gap between image and caption

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Set column-gap between the caption and close button

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Rename the class name

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Decrease inline spacing

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
This commit is contained in:
Suguru Hirahara 2022-07-04 15:10:46 +09:00 committed by GitHub
parent 37d8cfbc50
commit 0909bfeb38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
res/css/views/rooms/_LinkPreviewWidget.scss
View File

@ -15,35 +15,52 @@ limitations under the License.
*/
.mx_LinkPreviewWidget {
margin-top: 15px;
margin-right: 15px;
margin-bottom: 15px;
margin: $spacing-16 0 $spacing-16 auto;
display: flex;
border-left: 2px solid $preview-widget-bar-color;
column-gap: $spacing-4;
border-inline-start: 2px solid $preview-widget-bar-color;
border-radius: 2px;
color: $info-plinth-fg-color;
.mx_MatrixChat_useCompactLayout & {
margin-top: 6px;
margin-bottom: 6px;
}
// Exclude mx_LinkPreviewGroup_hide from wrapping
.mx_LinkPreviewWidget_wrapImageCaption {
display: flex;
flex-wrap: wrap;
row-gap: $spacing-8;
.mx_LinkPreviewWidget_image,
.mx_LinkPreviewWidget_caption {
margin-inline-start: $spacing-16;
min-width: 0; // Prevent blowout
}
.mx_LinkPreviewWidget_image {
flex: 0 0 100px;
margin-left: 15px;
text-align: center;
cursor: pointer;
}
.mx_LinkPreviewWidget_caption {
margin-left: 15px;
flex: 1 1 auto;
flex: 1;
overflow: hidden; // cause it to wrap rather than clip
}
.mx_LinkPreviewWidget_title,
.mx_LinkPreviewWidget_description {
display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
white-space: normal;
}
.mx_LinkPreviewWidget_title {
font-weight: bold;
white-space: normal;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
.mx_LinkPreviewWidget_siteName {
font-weight: normal;
@ -51,17 +68,9 @@ limitations under the License.
}
.mx_LinkPreviewWidget_description {
margin-top: 8px;
white-space: normal;
margin-top: $spacing-8;
word-wrap: break-word;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
.mx_MatrixChat_useCompactLayout {
.mx_LinkPreviewWidget {
margin-top: 6px;
margin-bottom: 6px;
}
}
}

2
src/components/views/rooms/LinkPreviewWidget.tsx
View File

@ -120,6 +120,7 @@ export default class LinkPreviewWidget extends React.Component<IProps> {
return (
<div className="mx_LinkPreviewWidget">
<div className="mx_LinkPreviewWidget_wrapImageCaption">
{ img }
<div className="mx_LinkPreviewWidget_caption">
<div className="mx_LinkPreviewWidget_title">
@ -132,6 +133,7 @@ export default class LinkPreviewWidget extends React.Component<IProps> {
{ description }
</div>
</div>
</div>
{ this.props.children }
</div>
);