From 1bc036a12d6877f78f1f5033603d803ac01a13d2 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 31 Aug 2014 00:40:42 +0100
Subject: nasty big monolithic commit of a whole bunch of UI/UX improvements: 
 - add a simple CSS template across the app for navigation & cosmetics  -
 split login into login & register, and totally reskin it  - restructure room
 CSS to play nicely with it  - implement basis 1:1 chat from user pages  -
 disable autofocus on iOS to improve UX

---
 webclient/settings/settings.html | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'webclient/settings')

diff --git a/webclient/settings/settings.html b/webclient/settings/settings.html
index 75d8e0887c..0ba3fe263a 100644
--- a/webclient/settings/settings.html
+++ b/webclient/settings/settings.html
@@ -1,16 +1,20 @@
 <div ng-controller="SettingsController" class="user" data-ng-init="onInit()">
 
-    <div id="page">
     <div id="wrapper">
-        
-        <h3>Me</h3>
+
+        <div id="genericHeading">
+            <img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/>
+        </div>
+
+        <h1>Settings</h1>
         <div class="section">
             <form>
                 <div class="profile-avatar">
-                    <img ng-src="{{ (null !== profile.avatarUrl) ? profile.avatarUrl : 'img/default-profile.jpg' }}" m-file-input="profile.avatarFile"/>
+                    <img ng-src="{{ (null !== profile.avatarUrl) ? profile.avatarUrl : 'img/default-profile.png' }}" m-file-input="profile.avatarFile"/>
                 </div>
                 <div id="user-ids">
-                    <input size="40" ng-model="profile.displayName" placeholder="Your name"/>            
+                    <input size="40" ng-model="profile.displayName" placeholder="Your display name"/>
+                    <br/>
                     <button ng-disabled="(profile.displayName == profileOnServer.displayName) && (profile.avatarUrl == profileOnServer.avatarUrl)"
                             ng-click="saveProfile()">Save</button>    
                 </div>
@@ -53,7 +57,7 @@
                 To enable it, reset the notification setting for this web site into your browser settings.
             </div>
             <div ng-switch-when="default">
-                <button ng-click="requestNotifications()">Click here to enable them</button>
+                <button ng-click="requestNotifications()" style="font-size: 14pt">Enable desktop notifications</button>
             </div>
             <div ng-switch-default="">
                 Sorry, your browser does not support notifications.
@@ -73,5 +77,4 @@
         {{ feedback }}
 
     </div>    
-    </div>
 </div>
-- 
cgit 1.5.1