gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1907 from vector-im/rav/fix_notification_warning_display 

Fix notifications warning layout
This commit is contained in:
Richard van der Hoff 2016-08-01 10:46:23 +01:00 committed by GitHub
parent d4faacf462 3860488bb5
commit 2123fec8ed
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/views/globals/MatrixToolbar.js
View File

@ -35,7 +35,7 @@ module.exports = React.createClass({
return ( return (
<div className="mx_MatrixToolbar"> <div className="mx_MatrixToolbar">
<img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/> <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
<div> <div className="mx_MatrixToolbar_content">
You are not receiving desktop notifications. <a className="mx_MatrixToolbar_link" onClick={ this.onClick }>Enable them now</a> You are not receiving desktop notifications. <a className="mx_MatrixToolbar_link" onClick={ this.onClick }>Enable them now</a>
</div> </div>
<div className="mx_MatrixToolbar_close"><img src="img/cancel.svg" width="18" height="18" onClick={ this.hideToolbar } /></div> <div className="mx_MatrixToolbar_close"><img src="img/cancel.svg" width="18" height="18" onClick={ this.hideToolbar } /></div>
@ -43,4 +43,3 @@ module.exports = React.createClass({
); );
} }
}); });

8
src/skins/vector/css/vector-web/views/globals/MatrixToolbar.css
View File

@ -33,6 +33,11 @@ limitations under the License.
margin-top: -2px; margin-top: -2px;
} }
.mx_MatrixToolbar_content {
-webkit-flex: 1;
flex: 1;
}
.mx_MatrixToolbar_link .mx_MatrixToolbar_link
{ {
color: #fff ! important; color: #fff ! important;
@ -41,10 +46,7 @@ limitations under the License.
} }
.mx_MatrixToolbar_close { .mx_MatrixToolbar_close {
-webkit-flex: 1;
flex: 1;
cursor: pointer; cursor: pointer;
text-align: right;
} }
.mx_MatrixToolbar_close img { .mx_MatrixToolbar_close img {