diff options
| author | Jason Croft | 2016-05-12 12:32:10 -0400 |
|---|---|---|
| committer | Jason Croft | 2016-05-12 12:32:10 -0400 |
| commit | e65d43bd81dc9af9be0c6df599800bc3ccf15a5e (patch) | |
| tree | 99f23b8a7d3885ca440ae952e6034da56c9d83f5 /public/views/header.ejs | |
| parent | 30e602a7400f3b38918a55f1470610b8d4ee49d7 (diff) | |
| parent | 4aa4e3eacc36ae54c49ac94cf40594f33c4d9b1d (diff) | |
Merge remote-tracking branch 'origin/master' into gitlab_snippets
# Conflicts:
# bower.json
# public/views/body.ejs
Diffstat (limited to 'public/views/header.ejs')
| -rw-r--r-- | public/views/header.ejs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/public/views/header.ejs b/public/views/header.ejs index ee89ddeb..6629d3a4 100644 --- a/public/views/header.ejs +++ b/public/views/header.ejs @@ -1,7 +1,7 @@ <nav class="navbar navbar-default navbar-fixed-top unselectable hidden-print"> <!-- Brand and toggle get grouped for better mobile display --> <div class="navbar-header"> - <span class="pull-right" style="margin-top: 17px; color: #777; float: right;"> + <span class="pull-right" style="margin-top: 17px; color: #777;"> <div class="visible-xs"> </div> <div class="visible-sm"> </div> <div class="visible-md"> </div> @@ -13,7 +13,7 @@ <ul class="dropdown-menu list" role="menu" aria-labelledby="menu"> </ul> </div> - <a class="navbar-brand" href="<%- url %>/"><i class="fa fa-file-text"></i> HackMD</a> + <a class="navbar-brand pull-left" href="<%- url %>"><i class="fa fa-file-text"></i> HackMD</a> <div class="nav-mobile pull-right visible-xs"> <span class="btn btn-link btn-file ui-upload-image" title="Upload Image" style="display:none;"> <i class="fa fa-camera"></i><input type="file" accept="image/*" name="upload" multiple> @@ -67,7 +67,7 @@ <li role="presentation"><a role="menuitem" class="ui-download-html" tabindex="-1" href="#" target="_self"><i class="fa fa-file-code-o fa-fw"></i> HTML</a> </li> <li class="divider"></li> - <li><a href="https://www.facebook.com/messages/866415986748945" class="ui-feedback" title="Feedback" target="_blank"><i class="fa fa-bullhorn fa-fw"></i> Feedback</a> + <li role="presentation"><a role="menuitem" class="ui-help" href="#" data-toggle="modal" data-target=".help-modal"><i class="fa fa-question-circle fa-fw"></i> Help</a> </li> </ul> <a class="btn btn-link ui-mode"> @@ -88,9 +88,9 @@ <input type="radio" name="mode" autocomplete="off"><i class="fa fa-columns"></i> </label> </div> - <a href="https://www.facebook.com/messages/866415986748945" class="btn btn-link ui-feedback" title="Feedback" target="_blank"> - <i class="fa fa-bullhorn"></i> - </a> + <span class="btn btn-link btn-file ui-help" title="Help" data-toggle="modal" data-target=".help-modal"> + <i class="fa fa-question-circle"></i> + </span> <span class="btn btn-link btn-file ui-upload-image" title="Upload Image" style="display:none;"> <i class="fa fa-camera"></i><input type="file" accept="image/*" name="upload" multiple> </span> |