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

This commit is contained in:
Weblate 2017-07-18 14:50:34 +00:00
commit 6e1c40ea0f
1 changed files with 6 additions and 1 deletions

View File

@ -316,7 +316,7 @@ limitations under the License.
font-family: inherit ! important; font-family: inherit ! important;
white-space: normal ! important; white-space: normal ! important;
line-height: inherit ! important; line-height: inherit ! important;
// color: inherit; // unclear why we ever had this? it breaks plain code blocks on dark theme... color: inherit;
font-size: 14px; font-size: 14px;
} }
@ -331,7 +331,9 @@ limitations under the License.
.mx_EventTile_content .markdown-body code { .mx_EventTile_content .markdown-body code {
background-color: #f8f8f8; background-color: #f8f8f8;
color: #333;
} }
.mx_EventTile_copyButton { .mx_EventTile_copyButton {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
@ -343,14 +345,17 @@ limitations under the License.
height: 19px; height: 19px;
background-image: url($copy-button-url); background-image: url($copy-button-url);
} }
.mx_EventTile_body pre { .mx_EventTile_body pre {
position: relative; position: relative;
border: 1px solid transparent; border: 1px solid transparent;
} }
.mx_EventTile:hover .mx_EventTile_body pre .mx_EventTile:hover .mx_EventTile_body pre
{ {
border: 1px solid $primary-hairline-color; border: 1px solid $primary-hairline-color;
} }
.mx_EventTile_body pre:hover .mx_EventTile_copyButton .mx_EventTile_body pre:hover .mx_EventTile_copyButton
{ {
visibility: visible; visibility: visible;