gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

skin dialogs correctly

This commit is contained in:
Matthew Hodgson 2015-07-21 16:48:55 -07:00
parent 0b3a9baa44
commit ceb214f192
2 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
skins/base/css/common.css
View File

@ -49,9 +49,9 @@ html {
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: #ccc; background-color: #000;
opacity: 0.5; opacity: 0.2;
z-index: -200; z-index: 2000;
} }
.mx_Dialog_Wrapper { .mx_Dialog_Wrapper {
@ -64,19 +64,43 @@ html {
.mx_Dialog { .mx_Dialog {
background-color: #fff; background-color: #fff;
color: #747474;
text-align: center;
margin: auto; margin: auto;
max-width: 500px; max-width: 500px;
z-index: -100; z-index: 2010;
font-weight: 300;
font-size: 16px;
position: relative; position: relative;
border-radius: 8px;
top: 200px; top: 200px;
} }
.mx_ErrorDialogTitle { .mx_Dialog_content {
background-color: #d2322d; margin: 35px;
min-height: 16px; }
padding: 15px;
border-bottom: 1px solid #e5e5e5; .mx_Dialog_buttons {
font-weight: bold; padding-bottom: 35px;
line-height: 1.4; }
.mx_Dialog button {
border: 0px;
width: 80px;
height: 36px;
line-height: 36px;
border-radius: 36px;
font-weight: 400;
font-size: 16px;
color: #fff; color: #fff;
background-color: #80cef4;
}
.mx_ErrorDialogTitle {
min-height: 16px;
padding: 12px;
border-bottom: 1px solid #a9dbf4;
font-weight: bold;
font-size: 20px;
line-height: 1.4;
} }

12
skins/base/views/organisms/ErrorDialog.js
View File

@ -40,10 +40,14 @@ module.exports = React.createClass({
<div className="mx_ErrorDialogTitle"> <div className="mx_ErrorDialogTitle">
{this.props.title} {this.props.title}
</div> </div>
{this.props.description}<br /> <div className="mx_Dialog_content">
<button onClick={this.props.onFinished} autoFocus={this.props.focus}> {this.props.description}
{this.props.button} </div>
</button> <div className="mx_Dialog_buttons">
<button onClick={this.props.onFinished} autoFocus={this.props.focus}>
{this.props.button}
</button>
</div>
</div> </div>
); );
} }