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

Remove panel element 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2020-12-20 19:48:24 +01:00
parent 7dd7aeffed
commit 6758734593
2 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
res/css/views/elements/_ImageView.scss
View File

@ -28,50 +28,55 @@ limitations under the License.
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; justify-content: center;
align-items: center;
overflow: hidden; overflow: hidden;
} }
.mainImage { .mainImage {
//margin: auto; object-fit: contain;
pointer-events: all;
max-width: 100vw;
max-height: 90vh;
min-width: 100px;
min-height: 100px;
&:hover { &:hover {
cursor: grab; cursor: grab;
} }
} }
.mx_ImageView_content img { .mx_ImageView_panel {
object-fit: contain; position: absolute;
z-index: 1000;
align-self: flex-start;
pointer-events: all; pointer-events: all;
} }
.mx_ImageView_panel {
display: flex;
justify-content: space-between;
padding: 50px;
position: absolute;
width: 100%;
}
.mx_ImageView_toolbar { .mx_ImageView_toolbar {
right: 0;
padding: 50px 50px 0 0;
display: flex; display: flex;
}
.mx_ImageView_button {
padding: 5px;
} }
.mx_ImageView_label { .mx_ImageView_label {
left: 0;
padding: 50px 0 0 50px;
text-align: left; text-align: left;
display: flex; display: flex;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
min-height: 100%;
max-width: 240px; max-width: 240px;
color: $lightbox-fg-color; color: $lightbox-fg-color;
} }
.mx_ImageView_button {
padding: 5px;
}
.mx_ImageView_name { .mx_ImageView_name {
font-size: $font-18px; font-size: $font-18px;
margin-bottom: 6px; margin-bottom: 6px;

6
src/components/views/elements/ImageView.js
View File

@ -260,15 +260,14 @@ export default class ImageView extends React.Component {
ref={ref => this.focusLock = ref} ref={ref => this.focusLock = ref}
> >
<div className="mx_ImageView_content"> <div className="mx_ImageView_content">
<div className="mx_ImageView_panel"> <div className="mx_ImageView_panel mx_ImageView_label">
<div className="mx_ImageView_label">
<div className="mx_ImageView_name"> <div className="mx_ImageView_name">
{ this.getName() } { this.getName() }
</div> </div>
{ metadata } { metadata }
<span className="mx_ImageView_size">{ sizeRes }</span> <span className="mx_ImageView_size">{ sizeRes }</span>
</div> </div>
<div className="mx_ImageView_toolbar"> <div className="mx_ImageView_panel mx_ImageView_toolbar">
<AccessibleButton className="mx_ImageView_button" title={_t("Zoom in")} onClick={ this.onZoomInClick }> <AccessibleButton className="mx_ImageView_button" title={_t("Zoom in")} onClick={ this.onZoomInClick }>
<img src={require("../../../../res/img/plus-white.svg")} alt={ _t('Zoom in') } width="18" height="18" /> <img src={require("../../../../res/img/plus-white.svg")} alt={ _t('Zoom in') } width="18" height="18" />
</AccessibleButton> </AccessibleButton>
@ -289,7 +288,6 @@ export default class ImageView extends React.Component {
<img src={require("../../../../res/img/cancel-white.svg")} width="18" height="18" alt={ _t('Close') } /> <img src={require("../../../../res/img/cancel-white.svg")} width="18" height="18" alt={ _t('Close') } />
</AccessibleButton> </AccessibleButton>
</div> </div>
</div>
<img <img
src={this.props.src} src={this.props.src}
title={this.props.name} title={this.props.name}