Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First wave of E2E visuals #2163

Merged
merged 5 commits into from
Sep 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ limitations under the License.
.mx_FilePanel .mx_EventTile .mx_MImageBody_downloadLink {
flex: 1 1 auto;
color: #747474;
word-break: break-all;
word-wrap: break-word;
}

.mx_FilePanel .mx_EventTile .mx_MImageBody_size {
Expand Down Expand Up @@ -88,7 +88,7 @@ limitations under the License.
font-size: 11px;
opacity: 1.0;
color: #acacac;
word-break: break-all;
word-wrap: break-word;
}

.mx_FilePanel .mx_EventTile .mx_MessageTimestamp {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ limitations under the License.
.mx_NotificationPanel .mx_EventTile_roomName {
font-weight: bold;
font-size: 14px;
word-wrap: break-word;
}

.mx_NotificationPanel .mx_EventTile_roomName a {
Expand All @@ -62,6 +63,7 @@ limitations under the License.
font-size: 12px;
display: inline;
padding-left: 0px;
word-wrap: break-word;
}

.mx_NotificationPanel .mx_EventTile_senderDetails {
Expand Down
55 changes: 46 additions & 9 deletions src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,13 @@ limitations under the License.

.mx_EventTile.mx_EventTile_info .mx_EventTile_avatar {
top: 8px;
left: 44px;
left: 65px;
}

.mx_EventTile_continuation {
padding-top: 0px ! important;
}

.mx_EventTile_verified {
background-color: #eaf5f0;
}

.mx_EventTile_unverified {
background-color: #ffa0a0;
}

.mx_EventTile .mx_SenderProfile {
color: #454545;
opacity: 0.5;
Expand Down Expand Up @@ -87,6 +79,10 @@ limitations under the License.
line-height: 22px;
}

.mx_EventTile_info .mx_EventTile_line {
padding-left: 83px;
}

/* HACK to override line-height which is already marked important elsewhere */
.mx_EventTile_bigEmoji.mx_EventTile_bigEmoji {
font-size: 48px ! important;
Expand Down Expand Up @@ -122,6 +118,10 @@ limitations under the License.
color: #fff;
}

.mx_EventTile_encrypting {
color: #abddbc ! important;
}

.mx_EventTile_sending {
color: #ddd;
}
Expand Down Expand Up @@ -227,6 +227,43 @@ limitations under the License.
overflow-y: hidden;
}

/* End to end encryption stuff */

.mx_EventTile_e2eIcon {
display: block;
position: absolute;
top: 9px;
left: 46px;
z-index: 2;
}

.mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line,
.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line {
padding-left: 60px;
}

.mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line {
border-left: #76cfa5 5px solid;
}
.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line {
border-left: #e8bf37 5px solid;
}

.mx_EventTile:hover.mx_EventTile_verified .mx_MessageTimestamp,
.mx_EventTile:hover.mx_EventTile_unverified .mx_MessageTimestamp {
left: 3px;
}

.mx_EventTile_verified .mx_EventTile_e2eIcon {
display: none;
}

.mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_e2eIcon,
.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_e2eIcon {
display: block;
left: 41px;
}

/* Various markdown overrides */

.mx_EventTile_content .markdown-body {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ limitations under the License.
.mx_LinkPreviewWidget_description {
margin-top: 8px;
white-space: normal;
word-break: break-word;
word-wrap: break-word;
}

.mx_LinkPreviewWidget_cancel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ limitations under the License.
width: 100%;
}

.mx_MessageComposer_e2eIcon {
position: absolute;
left: 46px;
}

.mx_MessageComposer_noperm_error {
width: 100%;
height: 60px;
Expand Down
12 changes: 12 additions & 0 deletions src/skins/vector/img/e2e-blocked.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions src/skins/vector/img/e2e-unencrypted.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/skins/vector/img/e2e-verified.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/skins/vector/img/e2e-warning.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.