Skip to content

Commit 3a4794b

Browse files
committed
merge master
2 parents 5679026 + fa436b6 commit 3a4794b

File tree

7 files changed

+16
-6
lines changed

7 files changed

+16
-6
lines changed

css/base.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,6 +1621,7 @@ img.channel {
16211621
background-color: rgba(255,255,255,0.90);
16221622
}
16231623

1624+
16241625
#image-preview-caption-panel {
16251626
display: flex;
16261627
justify-content: space-between;
@@ -1669,6 +1670,15 @@ img.channel {
16691670
font-size: 6rem;
16701671
}
16711672

1673+
#image-preview-container .doc-card {
1674+
display: flex;
1675+
flex-direction: column;
1676+
overflow-x: hidden;
1677+
background-color: #ccc;
1678+
padding: 1rem;
1679+
border-radius: 0.5rem;
1680+
}
1681+
16721682
/* Video-call related styles */
16731683

16741684
#video-container {

css/base.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/widgets/doc-preview.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export default class DocPreview extends React.PureComponent {
5151
<a href="#" onClick={(e) => {e.preventDefault(); this.props.onClose();}}><i className="material-icons gray">close</i></a>
5252
</div>
5353
<div id="image-preview-container">
54-
<div className="flex-column narrow">
54+
<div className="doc-card">
5555
<i className="material-icons gray">{iconFromMime(this.props.content.type)}</i>
5656
<div><b><FormattedMessage id="label_file_name" defaultMessage="File name:"
5757
description="Label for a file name" /></b> {shortenFileName(this.props.content.name, 24) || '-'}</div>

umd/index.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18150,7 +18150,7 @@ class DocPreview extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureCompo
1815018150
}, "close"))), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
1815118151
id: "image-preview-container"
1815218152
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
18153-
className: "flex-column narrow"
18153+
className: "doc-card"
1815418154
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", {
1815518155
className: "material-icons gray"
1815618156
}, iconFromMime(this.props.content.type)), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("b", null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {

umd/index.dev.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

umd/index.prod.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

umd/index.prod.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)