summary refs log tree commit diff
path: root/webclient
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-08-30 00:50:51 +0100
committerMatthew Hodgson <matthew@matrix.org>2014-08-30 00:50:51 +0100
commit2a0e79bbfabebc05ea3b1b2fd62af9bd198d8087 (patch)
treef12ad037a69be6558b8c49b91503fe0fde057bd8 /webclient
parentactually add a 'home' button (diff)
downloadsynapse-2a0e79bbfabebc05ea3b1b2fd62af9bd198d8087.tar.xz
tweaks to settings page
Diffstat (limited to 'webclient')
-rw-r--r--webclient/app.css9
-rw-r--r--webclient/settings/settings.html35
2 files changed, 16 insertions, 28 deletions
diff --git a/webclient/app.css b/webclient/app.css

index 9ba0aa997c..a5d0199bab 100644 --- a/webclient/app.css +++ b/webclient/app.css
@@ -428,15 +428,12 @@ h1 { } .profile-avatar img { - max-width: 100%; - max-height: 100%; + width: 100%; + height: 100%; + object-fit: cover; } /*** User profile page ***/ -#user-ids { - padding-left: 1em; -} - #user-displayname { font-size: 24px; } diff --git a/webclient/settings/settings.html b/webclient/settings/settings.html
index 51884e7209..75d8e0887c 100644 --- a/webclient/settings/settings.html +++ b/webclient/settings/settings.html
@@ -4,32 +4,22 @@ <div id="wrapper"> <h3>Me</h3> - <div> + <div class="section"> <form> - <table> - <tr> - <td> - <div class="profile-avatar"> - <img ng-src="{{ (null !== profile.avatarUrl) ? profile.avatarUrl : 'img/default-profile.jpg' }}" m-file-input="profile.avatarFile"/> - </div> - </td> - <td> - <div id="user-ids"> - <input size="40" ng-model="profile.displayName" placeholder="Your name"/> - </div> - </td> - <td> - <button ng-disabled="(profile.displayName == profileOnServer.displayName) && (profile.avatarUrl == profileOnServer.avatarUrl)" - ng-click="saveProfile()">Save</button> - </td> - </tr> - </table> + <div class="profile-avatar"> + <img ng-src="{{ (null !== profile.avatarUrl) ? profile.avatarUrl : 'img/default-profile.jpg' }}" m-file-input="profile.avatarFile"/> + </div> + <div id="user-ids"> + <input size="40" ng-model="profile.displayName" placeholder="Your name"/> + <button ng-disabled="(profile.displayName == profileOnServer.displayName) && (profile.avatarUrl == profileOnServer.avatarUrl)" + ng-click="saveProfile()">Save</button> + </div> </form> </div> <br/> <h3>Linked emails</h3> - <div> + <div class="section"> <form> <input size="40" ng-model="linkedEmails.linkNewEmail" ng-enter="linkEmail(linkedEmails.linkNewEmail)" /> <button ng-disabled="!linkedEmails.linkNewEmail" ng-click="linkEmail(linkedEmails.linkNewEmail)"> @@ -54,7 +44,7 @@ <br/> <h3>Desktop notifications</h3> - <div ng-switch="settings.notifications"> + <div class="section" ng-switch="settings.notifications"> <div ng-switch-when="granted"> Notifications are enabled. </div> @@ -72,8 +62,9 @@ <br/> <h3>Configuration</h3> - <div> + <div class="section"> <div>Home server: {{ config.homeserver }} </div> + <div>Identity server: {{ config.identityServer }} </div> <div>User ID: {{ config.user_id }} </div> <div>Access token: {{ config.access_token }} </div> </div>