summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorWu Cheng-Han2017-01-16 12:06:04 +0800
committerWu Cheng-Han2017-01-16 12:06:04 +0800
commit53223b5e2c9bb53737a4f812e61e0790833781db (patch)
tree27966408493b697c50c3717ecdeb9136debc1df8 /public
parentf2ee8976997906f76fae39a5f5d7f70860f2c8dc (diff)
Update index layout to add profile on navbar
Diffstat (limited to 'public')
-rw-r--r--public/css/cover.css22
-rw-r--r--public/views/index.ejs44
2 files changed, 43 insertions, 23 deletions
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 @@
</li>
<li class="ui-history<% if(signin) { %> active<% } %>"><a href="#"><%= __('History') %></a>
</li>
+ <div class="ui-signin" style="float: right; margin-top: 8px;<% if(signin) { %> display: none;<% } %>">
+ <% if(allowAnonymous) { %>
+ <a type="button" href="<%- url %>/new" class="btn btn-sm btn-link"><i class="fa fa-plus"></i> <%= __('New guest note') %></a>
+ <% } %>
+ <% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %>
+ <button class="btn btn-sm btn-success ui-signin" data-toggle="modal" data-target=".signin-modal"><%= __('Sign In') %></button>
+ <% } %>
+ </div>
+ <div class="ui-signout" style="float: right; margin-top: 8px;<% if(!signin) { %> display: none;<% } %>">
+ <a type="button" href="<%- url %>/new" class="btn btn-sm btn-link"><i class="fa fa-plus"></i> <%= __('New note') %></a>
+ <span class="ui-profile dropdown pull-right">
+ <button id="profileLabel" class="btn btn-sm btn-link ui-profile-label" style="padding-right: 0;" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <img class="ui-avatar" width="20" height="20"><span class="hidden-xs hidden-sm">&ensp;<span class="ui-name"></span></span>&ensp;<i class="fa fa-caret-down"></i>
+ </button>
+ <ul class="dropdown-menu" aria-labelledby="profileLabel">
+ <li><a href="<%- url %>/logout"><i class="fa fa-sign-out fa-fw"></i> <%= __('Sign Out') %></a></li>
+ </ul>
+ </span>
+ </div>
</ul>
</nav>
</div>
@@ -60,19 +79,15 @@
<% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %>
<span class="ui-signin">
<br>
- <a type="button" class="btn btn-lg btn-success ui-signin" data-toggle="modal" data-target=".signin-modal" style="min-width: 170px;"><%= __('Sign In') %></a>
+ <a type="button" class="btn btn-lg btn-success ui-signin" data-toggle="modal" data-target=".signin-modal" style="min-width: 200px;"><%= __('Sign In') %></a>
</span>
- <% }%>
- <% if((facebook || twitter || github || gitlab || dropbox || google || email) && allowAnonymous) { %>
<span class="ui-or"><%= __('or') %></span>
- <% }%>
- <% if(allowAnonymous) { %>
+ <% } %>
<span class="ui-signin">
- <a href="<%- url %>/new" class="btn btn-lg btn-default" style="min-width: 170px;"><%= __('New guest note') %></a>
+ <a type="button" href="<%- url %>/features" class="btn btn-lg btn-primary" style="min-width: 200px;"><%= __('Explore all features') %></a>
<br>
<br>
</span>
- <% }%>
<div class="lead row" style="width: 90%; margin: 0 auto;">
<div class="col-md-4 inner">
<a href="<%- url %>/features#share-notes">
@@ -97,21 +112,10 @@
</div>
<div id="history" class="section"<% if(!signin) { %> style="display:none;"<% } %>>
- <% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %>
- <div class="ui-signin">
+ <div class="ui-signin"<% if(signin) { %> style="display:none;"<% } %>>
<p><%= __('Below is the 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-md btn-default"><%= __('New note') %></a> <%= __('or') %>
- <a href="#" class="btn btn-danger ui-logout"><%= __('Sign Out') %></a>
- </div>
- <% }%>
- <h4>
- <a type="button" href="<%- url %>/features" class="btn btn-primary"><%= __('Explore all features') %></a>
- </h4>
- <hr>
+ <br>
<form class="form-inline">
<div class="form-group" style="vertical-align: bottom;">
<input class="form-control ui-use-tags" placeholder="<%= __('Select tags...') %>" />