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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate 2018-03-08 15:08:08 +00:00
commit 511a192d8b
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/rooms/RoomTooltip.js
View File

@ -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

4
src/skins/vector/css/matrix-react-sdk/views/elements/_ToolTipButton.scss
View File

@ -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;
}

28
src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
View File

@ -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;
}