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

Changes for E2E "fudge-button" #6288

Merged
merged 3 commits into from Mar 8, 2018
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/views/rooms/RoomTooltip.js
Expand Up @@ -31,7 +31,7 @@ module.exports = React.createClass({
tooltipClassName: React.PropTypes.string,
// The tooltip is derived from either the room name or a label
room: React.PropTypes.object,
label: React.PropTypes.string,
label: React.PropTypes.node,
},

// Create a wrapper for the tooltip outside the parent and attach it to the body element
Expand Down
Expand Up @@ -44,8 +44,8 @@ limitations under the License.
}

.mx_ToolTipButton_helpText {
width: 200px;
text-align: center;
width: 400px;
text-align: start;
line-height: 17px !important;
}

Expand Up @@ -298,6 +298,34 @@ limitations under the License.
cursor: pointer;
}

.mx_EventTile_keyRequestInfo {
font-size: 12px;
}

.mx_EventTile_keyRequestInfo_text {
opacity: 0.5;
}

.mx_EventTile_keyRequestInfo_text a {
color: $primary-fg-color;
text-decoration: underline;
cursor: pointer;
}

.mx_EventTile_keyRequestInfo_tooltip_contents p {
text-align: auto;
margin-left: 3px;
margin-right: 3px;
}

.mx_EventTile_keyRequestInfo_tooltip_contents p:first-child {
margin-top: 0px;
}

.mx_EventTile_keyRequestInfo_tooltip_contents p:last-child {
margin-bottom: 0px;
}

.mx_EventTile_12hr .mx_EventTile_e2eIcon {
padding-left: 5px;
}
Expand Down