Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

icons

Browse Source
This commit is contained in:
Matthew Hodgson 2015-10-11 22:51:00 +01:00
parent 50ebce69b7
commit 17c81c1101
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/skins/vector/css/organisms/LeftPanel.css
View File

@ -28,8 +28,9 @@ limitations under the License.
.mx_LeftPanel_hideButton { .mx_LeftPanel_hideButton {
position: absolute; position: absolute;
top: 18px; top: 10px;
right: 8px; right: 0px;
padding: 8px;
cursor: pointer; cursor: pointer;
} }

16
src/skins/vector/css/organisms/RoomView.css
View File

@ -212,7 +212,7 @@ limitations under the License.
.mx_RoomView_uploadProgressOuter { .mx_RoomView_uploadProgressOuter {
width: 100%; width: 100%;
background-color: #a9dbf4; background-color: rgba(169, 219, 244, 0.5);
height: 4px; height: 4px;
} }
@ -226,11 +226,23 @@ limitations under the License.
margin-left: 56px; margin-left: 56px;
} }
.mx_RoomView_uploadIcon {
float: left;
margin-top: 6px;
margin-left: 5px;
}
.mx_RoomView_uploadCancel {
float: right;
margin-top: 6px;
margin-right: 10px;
}
.mx_RoomView_uploadBytes { .mx_RoomView_uploadBytes {
float: right; float: right;
opacity: 0.5; opacity: 0.5;
margin-top: 15px; margin-top: 15px;
margin-right: 70px; margin-right: 10px;
} }
.mx_RoomView_ongoingConfCallNotification { .mx_RoomView_ongoingConfCallNotification {

BIN
src/skins/vector/img/cancel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/skins/vector/img/fileicon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

4
src/skins/vector/views/organisms/RoomView.js
View File

@ -154,8 +154,10 @@ module.exports = React.createClass({
<div className="mx_RoomView_uploadProgressOuter"> <div className="mx_RoomView_uploadProgressOuter">
<div className="mx_RoomView_uploadProgressInner" style={innerProgressStyle}></div> <div className="mx_RoomView_uploadProgressInner" style={innerProgressStyle}></div>
</div> </div>
<img className="mx_RoomView_uploadIcon" src="img/fileicon.png" width="40" height="40"/>
<img className="mx_RoomView_uploadCancel" src="img/cancel.png" width="40" height="40"/>
<div className="mx_RoomView_uploadBytes"> <div className="mx_RoomView_uploadBytes">
{filesize(this.state.upload.uploadedBytes).replace(/ .*/, '')} / {filesize(this.state.upload.totalBytes)} {filesize(this.state.upload.uploadedBytes).replace(/ .*/, '')} / {filesize(this.state.upload.totalBytes)}
</div> </div>
<div className="mx_RoomView_uploadFilename">Uploading {this.state.upload.fileName}</div> <div className="mx_RoomView_uploadFilename">Uploading {this.state.upload.fileName}</div>
</div> </div>