PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

remove unnamespaced CSS fail

Browse source
This commit is contained in:
Matthew Hodgson 2017-11-04 22:19:06 +00:00
parent 923295973b
commit adedf23cfb
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/globals/NewVersionBar.js
View file

@ -42,7 +42,7 @@ export default React.createClass({
const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog'); const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
Modal.createTrackedDialog('Display release notes', '', QuestionDialog, { Modal.createTrackedDialog('Display release notes', '', QuestionDialog, {
title: _t("What's New"), title: _t("What's New"),
description: <pre className="changelog_text">{releaseNotes}</pre>, description: <div className="mx_MatrixToolbar_changelog">{releaseNotes}</div>,
button: _t("Update"), button: _t("Update"),
onFinished: (update) => { onFinished: (update) => {
if(update && PlatformPeg.get()) { if(update && PlatformPeg.get()) {

5
src/skins/vector/css/_common.scss
View file

@ -294,11 +294,6 @@ textarea {
margin-top: 69px; margin-top: 69px;
} }
.changelog_text {
// why on earth is this needed? and with the wrong namespacing? >:(
font-family: $font-family;
}
.mx_Beta { .mx_Beta {
color: red; color: red;
margin-right: 10px; margin-right: 10px;

4
src/skins/vector/css/vector-web/views/globals/_MatrixToolbar.scss
View file

@ -56,3 +56,7 @@ limitations under the License.
.mx_MatrixToolbar_action { .mx_MatrixToolbar_action {
margin-right: 16px; margin-right: 16px;
} }
.mx_MatrixToolbar_changelog {
white-space: pre;
}