diff options
| author | Max Wu | 2016-05-15 12:24:33 +0800 |
|---|---|---|
| committer | Max Wu | 2016-05-15 12:24:33 +0800 |
| commit | 86b7304746acae4c1ec369ed5c4a03437a9c9821 (patch) | |
| tree | 54c5ba18e1f647b1270c2f4887b2a3dee02e163b /public | |
| parent | 1f4e1f09b639d49ebe818fd2b4d6e98f78ef2d38 (diff) | |
| parent | c4b754e53b9c7c233547ccf23d81774101386b10 (diff) | |
Merge pull request #122 from jccrofty30/avatar_on_history
Add avatar to History page.
Diffstat (limited to 'public')
| -rw-r--r-- | public/css/cover.css | 5 | ||||
| -rw-r--r-- | public/js/cover.js | 2 | ||||
| -rw-r--r-- | public/views/index.ejs | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/public/css/cover.css b/public/css/cover.css index 0a731cd2..351babd0 100644 --- a/public/css/cover.css +++ b/public/css/cover.css @@ -247,6 +247,11 @@ input { .sort.desc { text-decoration: underline; } +.ui-avatar { + border-radius: 15em; + height: auto; + width: 200px; +} .ui-history-close { position: absolute; right: 14px; diff --git a/public/js/cover.js b/public/js/cover.js index dde0c679..a7ee855f 100644 --- a/public/js/cover.js +++ b/public/js/cover.js @@ -32,6 +32,7 @@ function pageInit() { $('.ui-signin').hide(); $('.ui-or').hide(); $('.ui-welcome').show(); + $('.ui-avatar').prop('src',data.photo); $('.ui-name').html(data.name); $('.ui-signout').show(); $(".ui-history").click(); @@ -41,6 +42,7 @@ function pageInit() { $('.ui-signin').slideDown(); $('.ui-or').slideDown(); $('.ui-welcome').hide(); + $('.ui-avatar').prop('src',''); $('.ui-name').html(''); $('.ui-signout').hide(); parseStorageToHistory(historyList, parseHistoryCallback); diff --git a/public/views/index.ejs b/public/views/index.ejs index 62b2e543..98641df6 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -80,6 +80,7 @@ <p>Below are history from browser</p> </div> <div class="ui-signout" style="display:none;"> + <img class="ui-avatar" /> <h4 class="ui-welcome">Welcome! <span class="ui-name"></span></h4> <a href="<%- url %>/new" class="btn btn-default">New note</a> Or <a href="#" class="btn btn-danger ui-logout">Sign Out</a> |