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

2017-07-18 14:33:48 +00:00 · 2017-07-18 14:33:48 +00:00 · ec68c54644
parent 4e5e5dd6b3 e7ba618bbe
commit ec68c54644
1 changed files with 1 additions and 1 deletions
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@ -316,7 +316,7 @@ limitations under the License.
    font-family: inherit ! important;
    white-space: normal ! important;
    line-height: inherit ! important;
-    color: inherit;
+    // color: inherit; // unclear why we ever had this? it breaks plain code blocks on dark theme...
    font-size: 14px;
 }