OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4332 from vector-im/dbkr/fix_wierd_h2 

Fix h2 in markdown being weird
pull/4325/head
David Baker 2017-06-16 11:48:31 +01:00 committed by GitHub
parent 584e4c04da 2c186aafae
commit 05c667b34b
4 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/messages/DateSeparator.js
View File

@ -53,7 +53,7 @@ module.exports = React.createClass({
}
return (
<h2>{ label }</h2>
<h2 className="mx_DateSeparator">{ label }</h2>
);
}
});

1
src/skins/vector/css/_components.scss
View File

@ -77,6 +77,7 @@
@import "./vector-web/views/elements/_ImageView.scss";
@import "./vector-web/views/elements/_Spinner.scss";
@import "./vector-web/views/globals/_MatrixToolbar.scss";
@import "./vector-web/views/messages/_DateSeparator.scss";
@import "./vector-web/views/messages/_MessageTimestamp.scss";
@import "./vector-web/views/messages/_SenderProfile.scss";
@import "./vector-web/views/rooms/_RoomDropTarget.scss";

9
src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
View File

@ -127,15 +127,6 @@ limitations under the License.
clear: both;
}
.mx_RoomView_MessageList h2 {
clear: both;
margin-top: 32px;
margin-bottom: 8px;
margin-left: 63px;
padding-bottom: 6px;
border-bottom: 1px solid $primary-hairline-color;
}
.mx_RoomView_invitePrompt {
order: 2;

25
src/skins/vector/css/vector-web/views/messages/_DateSeparator.scss Normal file
View File

@ -0,0 +1,25 @@
/*
Copyright 2017 Vector Creations Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_DateSeparator {
clear: both;
margin-top: 32px;
margin-bottom: 8px;
margin-left: 63px;
padding-bottom: 6px;
border-bottom: 1px solid $primary-hairline-color;
}