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

Merge pull request #4026 from vector-im/luke/new-guest-access-rejig-nagbar 

Rejig the PaswordNagBar
This commit is contained in:
Luke Barnard 2017-05-25 17:57:16 +01:00 committed by GitHub
parent 790fc7ca4a 1db3ba676d
commit b25e6eb2a9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/globals/PasswordNagBar.js
View File

@ -39,8 +39,9 @@ export default React.createClass({
render: function() { render: function() {
const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
const toolbarClasses = "mx_MatrixToolbar mx_MatrixToolbar_clickable";
return ( return (
<div className="mx_MatrixToolbar"> <div className={toolbarClasses} onClick={this.onUpdateClicked}>
<img className="mx_MatrixToolbar_warning" <img className="mx_MatrixToolbar_warning"
src="img/warning.svg" src="img/warning.svg"
width="24" width="24"
@ -48,9 +49,9 @@ export default React.createClass({
alt="Warning" alt="Warning"
/> />
<div className="mx_MatrixToolbar_content"> <div className="mx_MatrixToolbar_content">
To be able to return to your account, you need to set a password. To return to your account in future you need to <u>set a password</u>
</div> </div>
<button className="mx_MatrixToolbar_action" onClick={this.onUpdateClicked}> <button className="mx_MatrixToolbar_action">
Set Password Set Password
</button> </button>
</div> </div>

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

@ -39,6 +39,10 @@ limitations under the License.
cursor: pointer; cursor: pointer;
} }
.mx_MatrixToolbar_clickable {
cursor: pointer;
}
.mx_MatrixToolbar_close { .mx_MatrixToolbar_close {
cursor: pointer; cursor: pointer;
} }