From 53223b5e2c9bb53737a4f812e61e0790833781db Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Mon, 16 Jan 2017 12:06:04 +0800 Subject: Update index layout to add profile on navbar --- public/css/cover.css | 22 +++++++++++++++++++--- public/views/index.ejs | 44 ++++++++++++++++++++++++-------------------- 2 files changed, 43 insertions(+), 23 deletions(-) (limited to 'public') diff --git a/public/css/cover.css b/public/css/cover.css index dcf7321c..a1527bfa 100644 --- a/public/css/cover.css +++ b/public/css/cover.css @@ -78,6 +78,13 @@ body { margin-top: 10px; margin-bottom: 10px; } +.masthead-nav { + text-align: left; + max-width: 1000px; + margin: 0 auto; + padding-left: 10px; + padding-right: 10px; +} .masthead-nav > li { display: inline-block; } @@ -263,9 +270,14 @@ input { text-decoration: underline; } .ui-avatar { - border-radius: 15em; - height: auto; - width: 60px; + display: inline-block; + overflow: hidden; + line-height: 1; + vertical-align: middle; + border-radius: 3px; +} +.ui-avatar.circle { + border-radius: 50%; } .ui-history-close { position: absolute; @@ -338,6 +350,10 @@ input { display: inline-block !important; } +.btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active { + color: white; +} + select { color: black; } diff --git a/public/views/index.ejs b/public/views/index.ejs index 55c13d2d..25139907 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -40,6 +40,25 @@
  • <%= __('History') %>
  • +
    + <% if(allowAnonymous) { %> + <%= __('New guest note') %> + <% } %> + <% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %> + + <% } %> +
    +
    + <%= __('New note') %> + + + + +
    @@ -60,19 +79,15 @@ <% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %>
    - <%= __('Sign In') %> + <%= __('Sign In') %>
    - <% }%> - <% if((facebook || twitter || github || gitlab || dropbox || google || email) && allowAnonymous) { %> <%= __('or') %> - <% }%> - <% if(allowAnonymous) { %> + <% } %> - <%= __('New guest note') %> + <%= __('Explore all features') %>

    - <% }%>
    @@ -97,21 +112,10 @@
    style="display:none;"<% } %>> - <% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %> -