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

CSS cleanup 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2021-02-25 11:50:50 +01:00
parent dc283241aa
commit 1955fff08c
No known key found for this signature in database
GPG Key ID: 9760693FDD98A790
2 changed files with 47 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,10 +34,9 @@ limitations under the License.
} }
.mx_ImageView_image { .mx_ImageView_image {
object-fit: contain;
pointer-events: all; pointer-events: all;
max-width: 100vw; max-width: 70vw;
max-height: 70vh; max-height: 70vh;
min-width: 100px; min-width: 100px;
min-height: 100px; min-height: 100px;
@ -46,43 +45,33 @@ limitations under the License.
.mx_ImageView_panel { .mx_ImageView_panel {
width: 100%; width: 100%;
height: 68px; height: 68px;
align-self: flex-start;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.mx_ImageView_toolbar {
padding-right: 16px;
right: 0;
display: flex;
align-items: center;
}
.mx_ImageView_toolbar_buttons {
display: flex;
align-items: center;
pointer-events: all;
}
.mx_ImageView_info_wrapper { .mx_ImageView_info_wrapper {
pointer-events: all;
padding-left: 32px; padding-left: 32px;
left: 0;
text-align: left;
display: flex; display: flex;
justify-content: center;
flex-direction: row; flex-direction: row;
color: $lightbox-fg-color;
align-items: center; align-items: center;
color: $lightbox-fg-color;
} }
.mx_ImageView_info { .mx_ImageView_info {
padding-left: 12px; padding-left: 12px;
pointer-events: all;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.mx_ImageView_toolbar {
padding-right: 16px;
pointer-events: all;
display: flex;
align-items: center;
}
.mx_ImageView_button { .mx_ImageView_button {
margin-left: 24px; margin-left: 24px;
display: block; display: block;

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

@ -308,45 +308,43 @@ export default class ImageView extends React.Component {
<div className="mx_ImageView_panel"> <div className="mx_ImageView_panel">
{info} {info}
<div className="mx_ImageView_toolbar"> <div className="mx_ImageView_toolbar">
<div className="mx_ImageView_toolbar_buttons"> <AccessibleTooltipButton
<AccessibleTooltipButton className="mx_ImageView_button mx_ImageView_button_rotateCW"
className="mx_ImageView_button mx_ImageView_button_rotateCW" title={_t("Rotate Right")}
title={_t("Rotate Right")} onClick={this.onRotateClockwiseClick}>
onClick={this.onRotateClockwiseClick}> </AccessibleTooltipButton>
</AccessibleTooltipButton> <AccessibleTooltipButton
<AccessibleTooltipButton className="mx_ImageView_button mx_ImageView_button_rotateCCW"
className="mx_ImageView_button mx_ImageView_button_rotateCCW" title={_t("Rotate Left")}
title={_t("Rotate Left")} onClick={ this.onRotateCounterClockwiseClick }>
onClick={ this.onRotateCounterClockwiseClick }> </AccessibleTooltipButton>
</AccessibleTooltipButton> <AccessibleTooltipButton
<AccessibleTooltipButton className="mx_ImageView_button mx_ImageView_button_zoomOut"
className="mx_ImageView_button mx_ImageView_button_zoomOut" title={_t("Zoom out")}
title={_t("Zoom out")} onClick={ this.onZoomOutClick }>
onClick={ this.onZoomOutClick }> </AccessibleTooltipButton>
</AccessibleTooltipButton> <AccessibleTooltipButton
<AccessibleTooltipButton className="mx_ImageView_button mx_ImageView_button_zoomIn"
className="mx_ImageView_button mx_ImageView_button_zoomIn" title={_t("Zoom in")}
title={_t("Zoom in")} onClick={ this.onZoomInClick }>
onClick={ this.onZoomInClick }> </AccessibleTooltipButton>
</AccessibleTooltipButton> <AccessibleTooltipButton
<AccessibleTooltipButton className="mx_ImageView_button mx_ImageView_button_download"
className="mx_ImageView_button mx_ImageView_button_download" title={_t("Download")}
title={_t("Download")} onClick={ this.onDownloadClick }>
onClick={ this.onDownloadClick }> </AccessibleTooltipButton>
</AccessibleTooltipButton> <ContextMenuTooltipButton
<ContextMenuTooltipButton className="mx_ImageView_button mx_ImageView_button_more"
className="mx_ImageView_button mx_ImageView_button_more" title={_t("Options")}
title={_t("Options")} onClick={this.onOpenContextMenu}
onClick={this.onOpenContextMenu} inputRef={this.contextMenuButton}
inputRef={this.contextMenuButton} />
/> <AccessibleTooltipButton
<AccessibleTooltipButton className="mx_ImageView_button mx_ImageView_button_close"
className="mx_ImageView_button mx_ImageView_button_close" title={_t("Close")}
title={_t("Close")} onClick={ this.props.onFinished }>
onClick={ this.props.onFinished }> </AccessibleTooltipButton>
</AccessibleTooltipButton> {this.renderContextMenu()}
{this.renderContextMenu()}
</div>
</div> </div>
</div> </div>
<div className="mx_ImageView_image_wrapper"> <div className="mx_ImageView_image_wrapper">