status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update index layout to add profile on navbar

This commit is contained in:
Wu Cheng-Han 2017-01-16 12:06:04 +08:00
parent f2ee897699
commit 53223b5e2c
2 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
public/css/cover.css
View File

@ -78,6 +78,13 @@ body {
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.masthead-nav {
text-align: left;
max-width: 1000px;
margin: 0 auto;
padding-left: 10px;
padding-right: 10px;
}
.masthead-nav > li { .masthead-nav > li {
display: inline-block; display: inline-block;
} }
@ -263,9 +270,14 @@ input {
text-decoration: underline; text-decoration: underline;
} }
.ui-avatar { .ui-avatar {
border-radius: 15em; display: inline-block;
height: auto; overflow: hidden;
width: 60px; line-height: 1;
vertical-align: middle;
border-radius: 3px;
}
.ui-avatar.circle {
border-radius: 50%;
} }
.ui-history-close { .ui-history-close {
position: absolute; position: absolute;
@ -338,6 +350,10 @@ input {
display: inline-block !important; display: inline-block !important;
} }
.btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active {
color: white;
}
select { select {
color: black; color: black;
} }

42
public/views/index.ejs
View File

@ -40,6 +40,25 @@
</li> </li>
<li class="ui-history<% if(signin) { %> active<% } %>"><a href="#"><%= __('History') %></a> <li class="ui-history<% if(signin) { %> active<% } %>"><a href="#"><%= __('History') %></a>
</li> </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> </ul>
</nav> </nav>
</div> </div>
@ -60,19 +79,15 @@
<% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %> <% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %>
<span class="ui-signin"> <span class="ui-signin">
<br> <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> </span>
<% }%>
<% if((facebook || twitter || github || gitlab || dropbox || google || email) && allowAnonymous) { %>
<span class="ui-or"><%= __('or') %></span> <span class="ui-or"><%= __('or') %></span>
<% } %> <% } %>
<% if(allowAnonymous) { %>
<span class="ui-signin"> <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>
<br> <br>
</span> </span>
<% }%>
<div class="lead row" style="width: 90%; margin: 0 auto;"> <div class="lead row" style="width: 90%; margin: 0 auto;">
<div class="col-md-4 inner"> <div class="col-md-4 inner">
<a href="<%- url %>/features#share-notes"> <a href="<%- url %>/features#share-notes">
@ -97,21 +112,10 @@
</div> </div>
<div id="history" class="section"<% if(!signin) { %> style="display:none;"<% } %>> <div id="history" class="section"<% if(!signin) { %> style="display:none;"<% } %>>
<% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %> <div class="ui-signin"<% if(signin) { %> style="display:none;"<% } %>>
<div class="ui-signin">
<p><%= __('Below is the history from browser') %></p> <p><%= __('Below is the history from browser') %></p>
</div> </div>
<div class="ui-signout" style="display:none;"> <br>
<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>
<form class="form-inline"> <form class="form-inline">
<div class="form-group" style="vertical-align: bottom;"> <div class="form-group" style="vertical-align: bottom;">
<input class="form-control ui-use-tags" placeholder="<%= __('Select tags...') %>" /> <input class="form-control ui-use-tags" placeholder="<%= __('Select tags...') %>" />