OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

image viewing tweaks

pull/296/head
Matthew Hodgson 2015-10-25 23:33:28 +00:00
parent 78cff9f20d
commit 363e3f4e21
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/skins/vector/css/common.css
View File

@ -128,10 +128,13 @@ a:visited {
max-width: 75%;
}
.mx_ImageView {
margin: 6px;
/* hack: flexbox bug? */
margin-bottom: 4px;
.mx_Dialog_lightbox .mx_Dialog_background {
opacity: 0.85;
}
.mx_Dialog_lightbox .mx_Dialog {
border-radius: 0px;
background-color: #000;
}
.mx_Dialog_content {

6
src/skins/vector/views/molecules/MImageTile.js
View File

@ -61,7 +61,7 @@ module.exports = React.createClass({
src: httpUrl,
width: content.info.w,
height: content.info.h
});
}, "mx_Dialog_lightbox");
}
},
@ -70,7 +70,7 @@ module.exports = React.createClass({
var cli = MatrixClientPeg.get();
var thumbHeight = null;
if (content.info) thumbHeight = this.thumbHeight(content.info.w, content.info.h, 320, 240);
if (content.info) thumbHeight = this.thumbHeight(content.info.w, content.info.h, 480, 360);
var imgStyle = {};
if (thumbHeight) imgStyle['height'] = thumbHeight;
@ -78,7 +78,7 @@ module.exports = React.createClass({
return (
<span className="mx_MImageTile">
<a href={cli.mxcUrlToHttp(content.url)} onClick={ this.onClick }>
<img className="mx_MImageTile_thumbnail" src={cli.mxcUrlToHttp(content.url, 320, 240)} alt={content.body} style={imgStyle} />
<img className="mx_MImageTile_thumbnail" src={cli.mxcUrlToHttp(content.url, 480, 360)} alt={content.body} style={imgStyle} />
</a>
<div className="mx_MImageTile_download">
<a href={cli.mxcUrlToHttp(content.url)} target="_blank">